[Python-checkins] peps: Make the "null-merge to default" step its own explicit step.

Mon Mar 2 20:47:22 CET 2015

https://hg.python.org/peps/rev/0cb9c8d26c7c
changeset: 5718:0cb9c8d26c7c
user: Larry Hastings <larry at hastings.org>
date: Mon Mar 02 11:47:01 2015 -0800
summary:
 Make the "null-merge to default" step its own explicit step.
I have now forgotten to do it twice, so hopefully this will
draw more attention to it and I won't miss it in the future.
files:
 pep-0101.txt | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -572,7 +572,7 @@
 (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
+ ___ If releasing from other than the default branch, remember to carefully
 merge any touched branches with higher level branches, up to default. For
 example:
 
@@ -584,7 +584,7 @@
 
 $ hg resolve --mark
 
- Commit and push to the main repo.
+ ___ Commit and push to the main repo.
 
 ___ You can delete the remote release clone, or simply reuse it for the next
 release.
-- 
Repository URL: https://hg.python.org/peps
