Changes between Version 36 and Version 37 of HowToSVN

Timestamp:

09/17/09 23:14:14 (15 years ago)

Author:

neteler

Comment:

Reverting a single file explained; fix wording

HowToSVN

@@ -164 +164 @@
 {{{
 cd lib/external
-# note the negative revision number:
+# note the negative revision number (that which you want to undo):
 svn merge -c -32526 https://svn.osgeo.org/grass/grass/trunk/
-svn ci -m "Reverted to previous version (r32526)... reason ..." file(s)
-}}}
-Here, 32526 is the revision corresponding to the indenting of the trunk. Passing a negative revision to "svn merge -c" will "unmerge" that change.
+
+# verify and submit
+svn diff file(s)
+svn ci -m "Reverted to previous version... reason ..." file(s)
+}}}
+Here, 32526 is a revision which was undesired. Passing a negative revision to "svn merge -c" will "unmerge" the change(s).
+
+Reverting a single file can be done also like this:
+
+{{{
+# get revision number
+svn log myfile | less
+
+# order: "-r bad:good" revision number
+svn merge -r 32526:32525 file
+
+# verify and submit
+svn diff file
+svn ci -m "Reverted to previous version ... reason ..." file
+}}}
+ 
 
 === File properties ===