iSharkFly-Open
/
python-peps
mirror of https://github.com/python/peps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify why cherry-picking is preferred in PEP 512

This commit is contained in:
Brett Cannon 2016-01-26 17:15:31 -08:00
parent 3ecdb18687
commit d45c401bb2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pep-0512.txt
View File

@ -788,6 +788,13 @@ handled. With a cherry-picking workflow, the main commit could
proceed while postponing the merge-failing cherry-picks. This allows proceed while postponing the merge-failing cherry-picks. This allows
for possibly distributing the work of managing conflicting merges. 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 Deriving ``Misc/NEWS`` from the commit logs
------------------------------------------- -------------------------------------------
As part of the discussion surrounding `Handling Misc/NEWS`_, the As part of the discussion surrounding `Handling Misc/NEWS`_, the