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

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 30 05:45:00 GMT 2007


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

Hi all,

This patch updates the merge code so that it emits a warning if it's
being asked to find a merge base in a criss-cross situation.

It's become apparent that this kind of merge behaves differently enough
from normal merges that people are perplexed when they encounter it.
Hopefully by explaining what's happened, we can help them deal with it
more quickly.

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

iD8DBQFHT6Nc0F+nu1YWqI0RAkbTAJ9Nj9RBptOuo01GspTR+17aVvLuUwCcDYo/
HP6h+7UApeWHjtOq+U9BTos=
=t55P
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-aaKwIG.patch
Type: text/x-diff
Size: 7818 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071130/e4568bb6/attachment-0001.bin 


More information about the bazaar mailing list