[Python-checkins] peps: Clarify why cherry-picking is preferred in PEP 512

[brett.cannon]

https://hg.python.org/peps/rev/89925c8d7eaa
changeset:   6209:89925c8d7eaa
user:        Brett Cannon <brett at python.org>
date:        Tue Jan 26 17:15:31 2016 -0800
summary:
  Clarify why cherry-picking is preferred in PEP 512

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


diff --git a/pep-0512.txt b/pep-0512.txt
--- a/pep-0512.txt
+++ b/pep-0512.txt
@@ -788,6 +788,13 @@
 proceed while postponing the merge-failing cherry-picks. This allows
 for possibly distributing the work of managing conflicting merges.
 
+Lastly, cherry-picking should help avoid merge races. Currently, when
+one is doing work that spans branches, it takes time to commit in the
+older branch, possibly push to another clone representing the
+``default`` branch, merge the change, and then push upstream.
+Cherry-picking should decouple this so that you don't have to rush
+your multi-branch changes as the cherry-pick can be done separately.
+
 Deriving ``Misc/NEWS`` from the commit logs
 -------------------------------------------
 As part of the discussion surrounding `Handling Misc/NEWS`_, the

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