[MERGE] Merge now warns when it encounters a criss-cross

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 30 16:00:07 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> Aaron Bentley wrote:
>> Michael Hudson wrote:
>>> Martin Pool wrote:
>>>> Maybe we can come up with a better message though:
>>>>
>>>> +                warning('Warning: criss-cross merge encountered.')
>>>>
>>>> So ok, the user now feels warned.  What are they to do?  If you could
>>>> tell them what they should do, or what the consequences are, or how to
>>>> avoid it, that would be better.
>> Well, I'm sort-of caught.  Normally in criss-cross merging situations, I
>> recommend using merge --weave.  But with packs, this is not really a
>> realistic option.
> 
>> I'm gonna see if I can implement per-file merge bases as a behavior that
>> happens when a criss-cross is encountered.  That would reduce the
>> consequences of criss-cross merge.
> 
> Would it be reasonable to do this even in the absence of criss-cross? I realize
> it is much more needed there, but I'm wondering if we couldn't get slightly
> fewer conflicts if we did it all the time. (I suppose if there isn't a criss
> cross, we would expect the per-file graph to be uninteresting?)

My intuition is that the per-file graph would select the same base text
as the revision graph, but I haven't sat down and worked it out.  And it
will be slower than the normal mechanism, because we'll have to
determine the tree base revision for inventory merging, as well as
multiple per-file base revisions.

>> Should I refer to local docs? "Warning: criss-cross merge encountered.
>> See "Criss-cross merging" in the User Guide"?

> Well, you can have it as a help topic. And then they can do:
> 
> bzr help criss-cross-merge

Good call.  I'll do that.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHUDOH0F+nu1YWqI0RAlL6AJsGbBnFt4W0mqx/cqWMNGi+wa375gCff+3R
YgT0TqE5OEVsqkFxgiwRVnA=
=9KmN
-----END PGP SIGNATURE-----



More information about the bazaar mailing list