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

[Terry Reedy]

On 11/8/2011 10:49 AM, Jesus Cea wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> When merging from 3.2 to 3.3 "Misc/NEWS" always conflicts (lately).
> Instead of copy&paste the test manually between versions, has anybody
> a better workflow?.

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.

-- 
Terry Jan Reedy