[Python-checkins] devguide: Add instructions for handling merge conflicts during null merges.

[chris.jerdonek]

http://hg.python.org/devguide/rev/78a69b929ab7
changeset:   573:78a69b929ab7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Nov 21 18:04:35 2012 -0800
summary:
  Add instructions for handling merge conflicts during null merges.

files:
  committing.rst |  11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -306,17 +306,24 @@
    # Fix any conflicts; compile; run the test suite
    hg commit
 
+.. index:: null merging
+
 .. note::
-   *If the patch shouldn't be ported* from Python 3.3 to Python 3.4, you must
-   also make it explicit: merge the changes but revert them before committing::
+   If the patch should *not* be ported from Python 3.3 to Python 3.4, you must
+   also make this explicit by doing a *null merge*: merge the changes but
+   revert them before committing::
 
       hg update default
       hg merge 3.3
       hg revert -ar default
+      hg resolve -am  # needed only if the merge created conflicts
       hg commit
 
    This is necessary so that the merge gets recorded; otherwise, somebody
    else will have to make a decision about your patch when they try to merge.
+   (Using a three-way merge tool generally makes the ``hg resolve`` step
+   in the above unnecessary; also see `this bug report
+   <http://bz.selenic.com/show_bug.cgi?id=2706>`__.)
 
 When you have finished your porting work (you can port several patches one
 after another in your local repository), you can push **all** outstanding

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