[MERGE, 154173] * ``pack-0.92`` repositories can now be reconciled.
Robert Collins
robertc at robertcollins.net
Thu Nov 29 04:19:42 GMT 2007
This hooks in the new logic I wrote to make reconcile smaller into the
pack to pack fetch operation, in a subclass for reconciling.
It passes all the reconcile interface tests. Its possible there are
still some corners to improve. Specifically if you reconcile a fully
packed repository where only the indices are wrong, it is *possible* for
the same pack to be generated, and then the new indices will not be
applied. But this is extremely hard to trigger (requires that the only
bad index entry is also the last text in the pack, and sort order issues
come into it too.). I'll follow up tomorrow probably with code to handle
that particular case.
John, I've done the first part of the work for bug 165290, for text
parents, as part of this patch - I needed it for reconcile.
-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-zUWotc.patch
Type: text/x-patch
Size: 33123 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071129/d19bbef4/attachment-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071129/d19bbef4/attachment-0001.pgp
More information about the bazaar
mailing list