Warn about null merging and the .hgtags file.

2012-03-17 19:13:39 -04:00 · 2012-03-17 19:13:39 -04:00 · 7c225bd154
parent 0d61249dee
commit 7c225bd154
1 changed files with 5 additions and 0 deletions
--- a/pep-0101.txt
+++ b/pep-0101.txt
@ -200,6 +200,11 @@ How to Make A Release

      $ .../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