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

Cameron Simpson cs at zip.com.au
Tue Nov 8 21:19:10 CET 2011

On 08Nov2011 13:50, Barry Warsaw <barry at python.org> wrote:
| On Nov 08, 2011, at 04:49 PM, Jesus Cea wrote:
| >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?.
| Does Mercurial support custom merge plugins?  I know for example, Bazaar has a
| custom merge plugin for dealing with debian/changelogs which has greatly
| reduced conflicts when doing similar operations there.

Yes it does. I use this facility to merge timesheet files mainatined on
separate hosts (home machine, travelling laptop) in my hgbox script.
The hgrc says:

  timesheets-cameron/2* = merge-dumb
  dailylog-cameron/2*/[A-Z]* = merge-dumb

so it is easy to specify a particular tool to merge particular files.

Cameron Simpson <cs at zip.com.au> DoD#743

It is a tale told by an idiot, full of sound and fury, signifying nothing.
        - William Shakespeare

More information about the Python-Dev mailing list