[Python-checkins] r68912 - peps/trunk/pep-0374.txt

brett.cannon python-checkins at python.org
Sat Jan 24 23:23:24 CET 2009


Author: brett.cannon
Date: Sat Jan 24 23:23:23 2009
New Revision: 68912

Log:
Tweaking "Backing Out Changes" scenario for svn to use the -c flag.

Thanks Benji York for the tip.


Modified:
   peps/trunk/pep-0374.txt

Modified: peps/trunk/pep-0374.txt
==============================================================================
--- peps/trunk/pep-0374.txt	(original)
+++ peps/trunk/pep-0374.txt	Sat Jan 24 23:23:23 2009
@@ -527,7 +527,7 @@
 ::
 
   # Assume the change to revert is in revision 40
-  svn merge -r40:39 .
+  svn merge -c -40 .
   # Resolve conflicts, if any.
   svn commit -m "Reverted revision 40"
  


More information about the Python-checkins mailing list