[Python-checkins] devguide: Update branch names after 3.4.0 release (ref #20890)

eric.araujo python-checkins at python.org
Mon Mar 17 21:38:39 CET 2014


http://hg.python.org/devguide/rev/414a7e2067b2
changeset:   677:414a7e2067b2
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Mar 17 16:37:12 2014 -0400
summary:
  Update branch names after 3.4.0 release (ref #20890)

files:
  committing.rst |  40 +++++++++++++++++++-------------------
  devcycle.rst   |  12 ++++++----
  setup.rst      |   4 +-
  3 files changed, 29 insertions(+), 27 deletions(-)


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -365,15 +365,15 @@
    $ hg import --no-c http://bugs.python.org/url/to/the/patch.diff
    $ # review, run tests, run `make patchcheck`
    $ hg ci -m '#12345: fix some issue.'
-   $ # switch to 3.3 and port the changeset using `hg graft`
-   $ cd ../3.3
+   $ # switch to 3.4 and port the changeset using `hg graft`
+   $ cd ../3.4
    $ hg up
    $ hg graft 2.7
    $ # switch to 3.x, merge, commit, and push everything
    $ cd ../3.x
    $ hg up
-   $ hg merge 3.3
-   $ hg ci -m '#12345: merge with 3.3.'
+   $ hg merge 3.4
+   $ hg ci -m '#12345: merge with 3.4.'
    $ hg push
 
 Unless noted otherwise, the rest of the page will assume you are using the
@@ -414,25 +414,25 @@
 Merging between different branches (within the same major version)
 ------------------------------------------------------------------
 
-Assume that Python 3.4 is the current in-development version of Python and that
-you have a patch that should also be applied to Python 3.3.  To properly port
+Assume that Python 3.5 is the current in-development version of Python and that
+you have a patch that should also be applied to Python 3.4.  To properly port
 the patch to both versions of Python, you should first apply the patch to
-Python 3.3::
+Python 3.4::
 
-   cd 3.3
+   cd 3.4
    hg import --no-commit patch.diff
    # Compile; run the test suite
    hg ci -m '#12345: fix some issue.'
 
-Then you can switch to the ``3.4`` clone, merge, run the tests and commit::
+Then you can switch to the ``3.5`` clone, merge, run the tests and commit::
 
-   cd ../3.4
-   hg merge 3.3
+   cd ../3.5
+   hg merge 3.4
    # Fix any conflicts (e.g. ``hg revert -r default Misc/NEWS``); compile; run the test suite
-   hg ci -m '#12345: merge with 3.3.'
+   hg ci -m '#12345: merge with 3.4.'
 
 If you are not using the share extension, you will need to use
-``hg pull ../3.3`` before being able to merge.
+``hg pull ../3.4`` before being able to merge.
 
 .. note::
    Even when porting an already committed patch, you should *still* check the
@@ -444,13 +444,13 @@
 Porting changesets between the two major Python versions (2.x and 3.x)
 ----------------------------------------------------------------------
 
-Assume you just committed something on ``2.7``, and want to port it to ``3.3``.
+Assume you just committed something on ``2.7``, and want to port it to ``3.4``.
 You can use ``hg graft`` as follow::
 
-   cd ../3.3
+   cd ../3.4
    hg graft 2.7
 
-This will port the latest changeset committed in the 2.7 clone to the 3.3 clone.
+This will port the latest changeset committed in the 2.7 clone to the 3.4 clone.
 ``hg graft`` always commits automatically, except in case of conflicts, when
 you have to resolve them and run ``hg graft --continue`` afterwards.
 Instead of the branch name you can also specify a changeset id, and you can
@@ -458,18 +458,18 @@
 
 On older version of Mercurial where ``hg graft`` is not available, you can use::
 
-    cd ../3.3
+    cd ../3.4
     hg export 2.7 | hg import -
 
 The result will be the same, but in case of conflict this will create ``.rej``
 files rather than using Mercurial merge capabilities.
 
-A third option is to apply manually the patch on ``3.3``.  This is convenient
+A third option is to apply manually the patch on ``3.4``.  This is convenient
 when there are too many differences with ``2.7`` or when there is already a
-specific patch for ``3.3``.
+specific patch for ``3.4``.
 
 .. warning::
-    Never use ``hg merge`` to port changes between 2.x and 3.x (or vice versa).
+   Never use ``hg merge`` to port changes between 2.x and 3.x (or vice versa).
 
 
 Long-term development of features
diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -31,7 +31,7 @@
 ''''''''
 
 There is a branch for each *feature version*, whether released or not (e.g.
-2.7, 3.3).  Development is handled separately for Python 2 and Python 3:
+2.7, 3.5).  Development is handled separately for Python 2 and Python 3:
 no merging happens between 2.x and 3.x branches.
 
 In each of the 2.x and 3.x realms, the branch for a feature version is always a
@@ -40,8 +40,8 @@
 
 Therefore, each change should be made **first** in the oldest branch to which it
 applies and forward-ported as appropriate: if a bug must be fixed in both Python
-3.3 and 3.4, first fix it in ``3.3`` and then merge ``3.3`` into ``default``
-(which holds the future 3.4).
+3.4 and 3.5, first fix it in ``3.4`` and then merge ``3.4`` into ``default``
+(which holds the future 3.5).
 
 
 .. _indevbranch:
@@ -109,9 +109,11 @@
 
 There are 5 open branches right now in the Mercurial repository:
 
-- the ``default`` branch holds the future 3.4 version and descends from ``3.3``
+- the ``default`` branch holds the future 3.5 version and descends from ``3.4``
   (future RM: Larry Hastings)
-- the ``3.3`` branch holds bug fixes for future 3.3.x maintenance releases
+- the ``3.4`` branch holds bug fixes for future 3.4.x maintenance releases
+  and descends from ``3.3`` (RM: Larry Hastings)
+- the ``3.3`` branch holds security fixes for future 3.3.x maintenance releases
   and descends from ``3.2`` (RM: Georg Brandl)
 - the ``3.2`` branch holds security fixes for future 3.2.x security releases
   (RM: Georg Brandl)
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -49,9 +49,9 @@
 
 If you want a working copy of an already-released version of Python,
 i.e., a version in :ref:`maintenance mode <maintbranch>`, you can update your
-working copy. For instance, to update your working copy to Python 3.3, do::
+working copy. For instance, to update your working copy to Python 3.4, do::
 
-   hg update 3.3
+   hg update 3.4
 
 You will need to re-compile CPython when you do such an update.
 

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


More information about the Python-checkins mailing list