[PATCH V2] merge: Add support for 'union' merge strategy

Matt Mackall mpm at selenic.com
Fri Jul 10 19:00:23 CDT 2015

On Fri, 2015-07-10 at 20:10 +0200, Erik Huelsmann wrote:
> # HG changeset patch
> # User Erik Huelsmann <ehuels at gmail.com>
> # Date 1435346089 -7200
> #      Fri Jun 26 21:14:49 2015 +0200
> # Node ID c8b0c9fb18ec813244b100e7ecf9ee5eb7b92f88
> # Parent  ff5172c830022b64cc5bd1bae36b2276e9dc6e5d
> merge: add support for 'union' merge strategy to internal merge tool.
> 'union' merge is a merge strategy where the left and right side of a
> conflicting merge are merged into the target without generating a conflict.
> One use-case for this merge strategy is the Changelog file being changed
> on multiple branches and conflicting when being merged back to the main
> branch.
> The idea for this merge strategy has been taken from Git.

This looks ok, but it's a bit much going on in one patch by our
standards. Could I get you to split it up into the following pieces:

- bits that add start/end_marker (but please, no _ in new names)
- bits that union option to simplemerge
- bits that split out filemerge helper function
- bits that add union merge + test of same

Also, we may want the start/end marker business to be fully internal to
simplemerge rather than passing extra arguments.

Mathematics is the supreme nostalgia of our time.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial-devel mailing list