[Python-checkins] devguide: Clarify wording
antoine.pitrou
python-checkins at python.org
Sun Mar 6 10:30:04 CET 2011
http://hg.python.org/devguide/rev/1d11bfb0b4a3
changeset: 375:1d11bfb0b4a3
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Mar 06 10:30:01 2011 +0100
summary:
Clarify wording
files:
committing.rst
diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -122,12 +122,16 @@
If the patch is a bugfix and it does not break
backwards-compatibility *at all*, then it should be applied to the oldest
branch applicable and forward-ported until it reaches the in-development branch
-of Python. A forward-port instead of a back-port is preferred as it allows the
-:abbr:`DAG (directed acyclic graph)` used by hg to work with the movement of
+of Python (for example, first in ``3.1``, then in ``3.2`` and finally in
+``default``). A forward-port instead of a back-port is preferred as it allows
+the :abbr:`DAG (directed acyclic graph)` used by hg to work with the movement of
the patch through the codebase instead of against it.
-Even when porting an already committed patch, you should **still** check the
-test suite runs successfully before committing the patch to another branch.
+.. warning::
+ Even when porting an already committed patch, you should **still** check the
+ test suite runs successfully before committing the patch to another branch.
+ Subtle differences between two branches sometimes make a patch bogus if
+ ported straightly.
Porting Within a Major Version
--
Repository URL: http://hg.python.org/devguide
More information about the Python-checkins
mailing list