[Python-checkins] peps: Warn about null merging and the .hgtags file.

[barry.warsaw]

http://hg.python.org/peps/rev/ee90eb960aba
changeset:   4142:ee90eb960aba
user:        Barry Warsaw <barry at python.org>
date:        Sat Mar 17 19:13:39 2012 -0400
summary:
  Warn about null merging and the .hgtags file.

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


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -200,6 +200,11 @@
 
       $ .../release/release.py --tag X.Y.ZaN
 
+      NOTE: when forward, i.e. "null" merging your changes to newer branches,
+      e.g. 2.6 -> 2.7, do *not* revert your changes to the .hgtags file or you
+      will not be able to run the --export command below.  Revert everything
+      else but leave .hgtags alone.
+
   ___ If this is a final major release, branch the tree for X.Y.
 
       When making a major release (e.g., for 3.2), you must create the

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