[Python-checkins] devguide: Advertise hg import before hg transplant

[antoine.pitrou]

http://hg.python.org/devguide/rev/51c640a3a782
changeset:   372:51c640a3a782
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Mar 06 09:55:08 2011 +0100
summary:
  Advertise hg import before hg transplant

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -178,20 +178,28 @@
 Porting Between Major Versions
 ''''''''''''''''''''''''''''''
 
+Let's say you have committed your changes as changeset ``a7df1a869e4a``
+in the 3.2 branch and now want to port it to 2.7.  This is simple.  First
+update your working copy to the 2.7 branch, then import the patch::
+
+   hg update 2.7
+   hg export a7df1a869e4a | hg import -
+   # Compile; run the test suite
+   hg commit
+
+You can also use the `transplant extension`_::
+
+   hg update 2.7
+   hg transplant a7df1a869e4a
+   # Compile; run the test suite
+
+
 .. warning::
    transplant always commits automatically. This breaks the
    "run the test suite before committing" rule. We could advocate using
    "hg qimport -r tip -P" afterwards but that would add another level of
    complexity.
 
-To port a patch from, e.g., Python 3.2 to 2.7, you can use the `transplant
-extension`_. Assuming you first committed your changes as changeset
-``a7df1a869e4a`` in the 3.2 branch and have now :ref:`updated
-<hg-switch-branches>` your working copy to the 2.7 branch, do::
-
-   hg transplant a7df1a869e4a
-   # Compile; run the test suite
-   hg push
 
 
 Differences with ``svnmerge``

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