[MERGE] Review feedback on dirstate update_basis_via_delta logic.

Robert Collins robertc at robertcollins.net
Wed Oct 24 06:50:19 BST 2007


Updated patch. There was indeed a bug, found by the A/B->A, A->A/B case.
I've hooked in a cross check with the working tree basis during check,
which isn't geared for tree comparisons yet, so I just did it the
easiest way, and added a smoke test that the command line check still
operates.

Cheers,
Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-5mmLqL.patch
Type: text/x-patch
Size: 51421 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071024/8f9db507/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/20071024/8f9db507/attachment-0001.pgp 


More information about the bazaar mailing list