[MERGE] Fix bug with merge --uncommitted --weave
Aaron Bentley
aaron at aaronbentley.com
Sun Dec 30 20:35:58 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi all,
This patch allows merge --uncommitted --weave to work properly. (And
also lca merge.)
For "weave" / newness merging, it's important to detect cherrypicks, and
that requires the base_is_ancestor and base_is_other_ancestor properties
to be defined.
When auto-selecting a merge base, these properties are trivial; both are
True. Otherwise, they can be expensive to calculate. So I've converted
them into lazily-evaluated properties. If unset, they are calculated,
but they can still be set manually.
This also involved creating a new revision_graph lazy property, so that
we don't wind up doing multiple Repository.get_graph calls.
This is a bugfix, but there's no Launchpad bug number AFAIK.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHeAEu0F+nu1YWqI0RAtdUAJ90F1WR+DFza4hGFD43ZBhGiHHgAgCeOr4B
1xPpqmtLqDnrDU1Kx7PejdQ=
=7+0m
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-uncommitted-weave.patch
Type: text/x-diff
Size: 11371 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071230/b28ead74/attachment-0001.bin
More information about the bazaar
mailing list