[Python-checkins] peps: Add instructions to up-merge branches after merging release clone.

[georg.brandl]

https://hg.python.org/peps/rev/555b1e389e83
changeset:   5581:555b1e389e83
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 12 08:59:21 2014 +0200
summary:
  Add instructions to up-merge branches after merging release clone.

files:
  pep-0101.txt |  12 ++++++++++++
  1 files changed, 12 insertions(+), 0 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -572,6 +572,18 @@
       (usually only one, except if you made a new maintenance release).
       Easily resolvable conflicts may appear in Misc/NEWS.
 
+      If releasing from other than the default branch, remember to carefully
+      merge any touched branches with higher level branches, up to default.  For
+      example:
+
+      $ hg update -C default
+      $ hg resolve --list
+      $ hg merge --tool "internal:fail" 3.4
+
+      ... here, revert changes that are not relevant for the default branch...
+
+      $ hg resolve --mark
+
       Commit and push to the main repo.
 
   ___ You can delete the remote release clone, or simply reuse it for the next

-- 
Repository URL: https://hg.python.org/peps