Home Original page

[python-committers] Guidance on merging(?)

Jesus Cea jcea at jcea.es
Sun May 8 09:51:20 EDT 2016 
On 08/05/16 15:31, Serhiy Storchaka wrote:
> For future, you should first commit your patch in 3.5, and then merge
> it in default.

Yes, for the future, you should write the patch for the oldest branch
appropriate and then just merge it to the next branches.

Let's say you have a security fich for 3.4 and up. You should write in
in the 3.4 branch and then do a trivial merge from 3.4 to 3.5 and from
3.5 to default (3.6).

-- 
Jesús Cea Avión                         _/_/      _/_/_/        _/_/_/
jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
Twitter: @jcea                        _/_/    _/_/          _/_/_/_/_/
jabber / xmpp:jcea at jabber.org  _/_/  _/_/    _/_/          _/_/  _/_/
"Things are not so easy"      _/_/  _/_/    _/_/  _/_/    _/_/  _/_/
"My name is Dump, Core Dump"   _/_/_/        _/_/_/      _/_/  _/_/
"El amor es poner tu felicidad en la felicidad de otro" - Leibniz

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://mail.python.org/pipermail/python-committers/attachments/20160508/1af000ca/attachment.sig>
More information about the python-committers mailing list