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

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 30 12:10:12 GMT 2007


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

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.

I think, in theory, I can implement a cheaper version of annotate merge
(because the type of annotation it needs is very restricted), but I
don't think I can do it on this deadline.

> You could link to http://revctrl.org/CrissCrossMerge, though that
> might be a bit hard core :-) Perhaps writing a friendlier page on the
> Bazaar wiki and linking to that would be sane, though.


So it seems like documentation is The Right Thing.  Should I say
"Warning: criss-cross merge encountered.  See
http://doc.bazaar-vcs.org/latest/en/user-guide/criss_cross.html" ?

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

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

iD8DBQFHT/2k0F+nu1YWqI0RAl7mAKCCBi6lsKyMvFWjSx6kSH2VlPBbcgCeJcI7
BuY2sx9S19JK2E1Qti4WLHA=
=9CDk
-----END PGP SIGNATURE-----



More information about the bazaar mailing list