Update the example for Mercurial in "Separation of Issue Dependencies".
Add a note about newline translation on Windows.
This commit is contained in:
parent
1b5e100206
commit
ad082c65d1
29
pep-0374.txt
29
pep-0374.txt
|
@ -331,8 +331,8 @@ Minimally, you should set your user name. To do so, create the file
|
||||||
[ui]
|
[ui]
|
||||||
username = Firstname Lastname <email.address@example.com>
|
username = Firstname Lastname <email.address@example.com>
|
||||||
|
|
||||||
If you are using Windows, enable the win32text extension to use
|
If you are using Windows and your tools do not support Unix-style newlines,
|
||||||
Unix-style newlines by adding to your configuration::
|
you can enable automatic newline translation by adding to your configuration::
|
||||||
|
|
||||||
[extensions]
|
[extensions]
|
||||||
win32text =
|
win32text =
|
||||||
|
@ -1061,28 +1061,29 @@ now-redundant fix-socket thread.
|
||||||
|
|
||||||
hg
|
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
|
hg clone trunk issue0000
|
||||||
cd issue0000
|
cd issue0000
|
||||||
# Edit some code (e.g. urllib).
|
# Edit some code (e.g. urllib).
|
||||||
cd ..
|
hg shelve
|
||||||
hg clone trunk fix-socket-bug
|
# Select changes to put aside
|
||||||
cd fix-socket-bug
|
|
||||||
# Edit some other code (e.g. socket).
|
# Edit some other code (e.g. socket).
|
||||||
hg commit
|
hg commit
|
||||||
cd ../issue0000
|
hg unselve
|
||||||
hg pull ../fix-socket-bug
|
# Complete initial fix.
|
||||||
hg merge
|
|
||||||
# Edit some more code.
|
|
||||||
hg commit
|
hg commit
|
||||||
cd ../trunk
|
|
||||||
hg pull ../issue0000
|
|
||||||
hg merge
|
|
||||||
hg push
|
|
||||||
cd ..
|
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
|
git
|
||||||
'''
|
'''
|
||||||
|
|
Loading…
Reference in New Issue