[Python-checkins] devguide: Add an XXX that transplant commits automatically (which we would like to

[antoine.pitrou]

antoine.pitrou pushed 2a3371e026e6 to devguide:

http://hg.python.org/devguide/rev/2a3371e026e6
changeset:   307:2a3371e026e6
branch:      hg_transition
tag:         tip
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Feb 13 02:10:31 2011 +0100
summary:
  Add an XXX that transplant commits automatically (which we would like to
avoid)

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -142,12 +142,17 @@
 Porting Between Major Versions
 ''''''''''''''''''''''''''''''
 
-To move a patch between, e.g., Python 3.2 and 2.7, use the `transplant
+.. warning:: XXX transplant always commits automatically. This breaks the
+   "run the test suite before committing" rule. We could advocate
+   "hg transplant --mq" but combining transplant and mq is another level
+   of complexity.
+
+To move a patch between, e.g., Python 3.1 and 2.7, use the `transplant
 extension`_. Assuming you committed in Python 2.7 first, to pull changeset
-#12345 into Python 3.2, do::
+``a7df1a869e4a`` into Python 3.1, do::
 
-   hg transplant -s <URL to 2.7 repo> -m 12345
-   # XXX any other steps required, or is it the quivalent of merged and committed?
+   hg transplant -s <URL to 2.7 repo> a7df1a869e4a
+   # Compile; run the test suite
    hg push
 
 

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