Changes between Version 11 and Version 12 of code/tools/SVN

Timestamp:

May 2, 2008, 1:39:27 AM (16 years ago)

Author:

scheusso

Comment:

—

code/tools/SVN

@@ -139 +139 @@
 svn di .
 }}}
+
+
+=== merge ===
+
+For those of you, who are courageous enough to merge two branches, or adequate, here's a little description about merge:
+The merge command takes the difference between two repositories (or revisions) and inserts the diff into a working copy.
+
+You can for example use it like that: 
+{{{
+svn merge <remote-trunk> -rOLDREVISION:NEWREVISION <destination>
+}}}
+
+
+It is important to understand, that this command acts like a diff-chat combination. You could also type:
+{{{
+svn diff <remote-trunk> -rOLDREVISION:NEWREVISION > patch-file && cd <destination> && patch -p0 < <path-to-patch-file>
+}}}