[MERGE] compare_trees with all unknowns

Robert Collins robertc at robertcollins.net
Tue Jul 25 01:29:57 BST 2006


On Mon, 2006-07-24 at 18:59 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > On Mon, 2006-07-24 at 08:02 -0500, John Arbash Meinel wrote:
> 
> >> But until we get there, I would at least like this bug fixed.
> > 
> > Sure. I'm currently working on status though, in my dirstate branch -
> > I'd like to be in sync with you on the changes. I haven't added unknowns
> > to the delta at this point - but I have got into the move of
> > compare_trees already.
> > 
> > Rob
> > 
> 
> Well, it would make more sense to me to have a small bug fix for 0.9,
> and have your dirstate improvements come in afterwards. Is that okay?

Sure.

> I have 2 of your patches in my queue to review, they are just pretty big.

Sorry - I've been trying to split the work out as much as possible into
single-purpose patches. If you have comments about how those patches
could be shrunk, please let me know.

-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: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060725/22f25e6c/attachment.pgp 


More information about the bazaar mailing list