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

Sat Feb 28 17:38:22 CET 2009

Author: alexandre.vassalotti
Date: Sat Feb 28 17:38:22 2009
New Revision: 70066
Log:
Fix issue dependency example for Mercurial.
The previous example was removing the temporary branch before
merging the changes in it to somewhere more permanent.
Modified:
 peps/trunk/pep-0374.txt
Modified: peps/trunk/pep-0374.txt
==============================================================================

--- peps/trunk/pep-0374.txt	(original)
+++ peps/trunk/pep-0374.txt	Sat Feb 28 17:38:22 2009
@@ -1063,8 +1063,11 @@
 hg unshelve
 # Complete initial fix.
 hg commit
- cd ..
- rm -rf issue0000
+ cd ../trunk
+ hg pull ../issue0000
+ hg merge
+ hg commit
+ rm -rf ../issue0000
 
 Several other way to approach this scenario with Mercurial. Alexander Solovyov
 presented a few `alternative approaches`_ on Mercurial's mailing list.
