[MERGE] Reconcile can fix bad parent references

Robert Collins robertc at robertcollins.net
Sun Sep 2 23:46:26 BST 2007


On Tue, 2007-08-28 at 20:48 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Here is a new patch which I believe resolves all your concerns.

It would be really nice if bb could give me the incremental changes on
the branch (and ignore bzr.dev changes at the same time of course) :).

I'm certainly a lot happier. I still don't get why we need
RevisionParentsProvider though.

If we can have bad parents from the revision knit then we have to check
that. And if we check it first then we know its accurate by the time we
come to check the file texts ancestry. So I don't see *why* we ever need
a different parents provider to the repositories native index in
find_bad_ancestry.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- 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/20070903/d494929e/attachment.pgp 


More information about the bazaar mailing list