Changes between Version 5 and Version 6 of Software_Development

Timestamp:

Oct 2, 2009, 1:30:34 PM (17 years ago)

Author:

eugene

Comment:

--

Software_Development

@@ -11 +11 @@
 
 Merging branches into trunk:
- * goto branch:
-{{{ svn merge $svn/trunk }}}
- * goto local trunk copy:
-{{{ svn merge --reintegrate $svn/branches/mybranch }}}
+ * goto branch: {{{ svn merge $svn/trunk }}}
+ * goto local trunk copy: {{{ svn merge --reintegrate $svn/branches/mybranch }}}
  * if you have the following message:
 {{{
@@ -23 +21 @@
 
  * goto branch:
-{{{ svn -R propdel svn:mergeinfo . }}}
-{{{ svn ci 'deleted mergeinfo from everywhere on branch' .}}}
-  then return to trunk copy and do the reintegration again.
-
-
+{{{ 
+  svn -R propdel svn:mergeinfo .
+  svn ci 'deleted mergeinfo from everywhere on branch' .
+}}}
+  then return to trunk copy and do the reintegration again.  See [http://groups.google.com/group/tortoisesvn/browse_thread/thread/ed9b79704d279b66?pli=1 this thread] for a discussion.