[Python-checkins] devguide: Mention mpatch in the committing guide as well

[antoine.pitrou]

http://hg.python.org/devguide/rev/fecc74afa435
changeset:   385:fecc74afa435
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Mar 12 00:03:16 2011 +0100
summary:
  Mention mpatch in the committing guide as well

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -200,6 +200,9 @@
    hg transplant a7df1a869e4a
    # Compile; run the test suite
 
+If you often get failures porting patches this way, you should consider
+using the :ref:`mpatch <merge-patch>` utility.
+
 
 .. warning::
    transplant always commits automatically. This breaks the

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