[Python-checkins] devguide (hg_transition): Drop the "-s" option to hg transplant and improve wording

[antoine.pitrou]

antoine.pitrou pushed 15e302905a5b to devguide:

http://hg.python.org/devguide/rev/15e302905a5b
changeset:   342:15e302905a5b
branch:      hg_transition
tag:         tip
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Feb 27 20:25:04 2011 +0100
summary:
  Drop the "-s" option to hg transplant and improve wording

files:
  committing.rst
  faq.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -184,11 +184,12 @@
    "hg qimport -r tip -P" afterwards but that would add another level of
    complexity.
 
-To move a patch between, e.g., Python 3.2 and 2.7, use the `transplant
-extension`_. Assuming you committed in Python 2.7 first, to pull changeset
-``a7df1a869e4a`` into Python 3.2, do::
+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 -s <URL to 2.7 repo> a7df1a869e4a
+   hg transplant a7df1a869e4a
    # Compile; run the test suite
    hg push
 
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -142,6 +142,8 @@
    update: (current)
 
 
+.. _hg-switch-branches:
+
 How do I switch between branches inside my working copy?
 --------------------------------------------------------
 

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