[MERGE] support merge when both branches have no reachable 'import' revisions
Robert Collins
robertc at robertcollins.net
Wed Mar 22 16:24:14 GMT 2006
This patch allows merge to find a base when there are no revisions
present in the repository with no parents : that is, all the 'import'
revisions are ghosts.
This is a not-uncommon situation with baz imports.
Cheers
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ghost-capable-common-ancestor.patch
Type: text/x-patch
Size: 5266 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060323/1fc8baa2/attachment.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060323/1fc8baa2/attachment.pgp
More information about the bazaar
mailing list