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

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


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

Alexander Belchenko wrote:
> Martin Pool пишет:
>> Martin Pool has voted tweak.
>> Status is now: Conditionally approved
>> Comment:
>> If you think this will help user understanding it's ok with me.  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?

> IIUC, we should suggest to use `merge --weave` as Aaron recently explain
> in my question, see recent thread with title like "merge A B and merge B
> A produce different set of conflicts".

Unfortunately, that option is quite expensive with packs, because it
uses annotation.  A merge that results in 5 modified files takes 1:53
minutes.

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

iD8DBQFHT/8P0F+nu1YWqI0RApytAJ42koCLEe0O5TUnzXhZwkqM/ssCBgCcDA4Q
TVEOyEa9WmulogvcakBami8=
=wd2G
-----END PGP SIGNATURE-----



More information about the bazaar mailing list