[Python-checkins] devguide: Denote the changes in forward-porting changes between feature clones and

[brett.cannon]

brett.cannon pushed d621fcb29f04 to devguide:

http://hg.python.org/devguide/rev/d621fcb29f04
changeset:   277:d621fcb29f04
branch:      hg_transition
tag:         tip
user:        Brett Cannon <brett at python.org>
date:        Tue Feb 08 13:38:03 2011 -0800
summary:
  Denote the changes in forward-porting changes between feature clones and working in a single clone.

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -71,10 +71,19 @@
    hg commit
 
 With the patch now committed (notice that pushing to hg.python.org is not
-needed yet), you want to merge the patch up into Python 3.2::
+needed yet), you want to merge the patch up into Python 3.2. Assuming you are
+doing all of your work in a single clone::
 
    hg update py3k
    hg merge release-31maint
+
+If you are using feature clones, then do::
+
+   hg pull <branch name>
+   hg merge
+
+Now that the changes have been pulled into the proper branch/clone, do::
+
    # Fix any conflicts; probably Misc/NEWS at least
    hg commit
    hg push
@@ -85,8 +94,8 @@
 merged (hopefully this will not be the case).
 
 If you want to do the equivalent of blocking a patch in Python 3.2 that was
-applied to Python 3.1, simply merge the change but revert the changes before
-committing::
+applied to Python 3.1, simply pull/merge the change but revert the changes
+before committing::
 
    hg merge release-31maint
    hg revert -a

--
Repository URL: http://hg.python.org/devguide