[Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"

Jesus Cea jcea at jcea.es
Wed Nov 9 23:21:35 CET 2011

Hash: SHA1

On 08/11/11 19:51, Terry Reedy wrote:
> If a bug is fixed in 3.2.latest, then it will not be new in 3.3.0,
> so perhaps it should not be added there. NEWS could just refer back
> to previous sections. Then 3.3.0 News would only be new features
> and the occasional ambiguous item not fixed before.

I am confused. My usual usage case is this:

1. I fix something in 3.2.
2. I merge that fix into 3.3. Everything goes smooth except Misc/NEWS.
3. Recover the original 3.3 Misc/NEWS, and add manually what I added
to the 3.2 Misc/NEWS. Mark the file as "resolved" and commit.

I would like to avoid (3).

A custom merge script is an option, but seems complicated and error
prone. I have the feeling that structuring Misc/NEWS in the right way
could solve it automatically. Something like adding patches to be
up-ported/merged at the end of the section, 3.3 only patches be added
at the beginning, so they don't conflict.

A bit of discipline and, voila, automatic flawless merges! :-)

- -- 
Jesus Cea Avion                         _/_/      _/_/_/        _/_/_/
jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
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
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/


More information about the Python-Dev mailing list