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

Mon Feb 16 06:33:24 CET 2009

Author: alexandre.vassalotti
Date: Mon Feb 16 06:33:23 2009
New Revision: 69663
Log:
Update the example for Mercurial in "Separation of Issue Dependencies".
Add a note about newline translation on Windows.
Modified:
 peps/trunk/pep-0374.txt
Modified: peps/trunk/pep-0374.txt
==============================================================================

--- peps/trunk/pep-0374.txt	(original)
+++ peps/trunk/pep-0374.txt	Mon Feb 16 06:33:23 2009
@@ -331,8 +331,8 @@
 [ui]
 username = Firstname Lastname <email.address at example.com>
 
-If you are using Windows, enable the win32text extension to use
-Unix-style newlines by adding to your configuration::
+If you are using Windows and your tools do not support Unix-style newlines,
+you can enable automatic newline translation by adding to your configuration::
 
 [extensions]
 win32text =
@@ -1061,28 +1061,29 @@
 
 hg
 ''
+
+One approach is to use the shelve extension; this extension is not included
+with Mercurial, but it is easy to install. With shelve, you can select changes
+to put temporarily aside.
 ::
 
 hg clone trunk issue0000
 cd issue0000
 # Edit some code (e.g. urllib).
- cd ..
- hg clone trunk fix-socket-bug
- cd fix-socket-bug
+ hg shelve
+ # Select changes to put aside
 # Edit some other code (e.g. socket).
 hg commit
- cd ../issue0000
- hg pull ../fix-socket-bug
- hg merge
- # Edit some more code.
+ hg unselve
+ # Complete initial fix.
 hg commit
- cd ../trunk
- hg pull ../issue0000
- hg merge
- hg push
 cd ..
- rm -rf issue0000 fix-socket-bug
+ rm -rf issue0000
+
+Several other way to approach this scenario with Mercurial. Alexander Solovyov
+presented a few `alternative approaches`_ on Mercurial's mailing list.
 
+.. _alternative approaches: http://selenic.com/pipermail/mercurial/2009-January/023710.html
 
 git
 '''
