[MERGE] [BUG #161131] Correct DirState._discard_merge_parents
Robert Collins
robertc at robertcollins.net
Thu Nov 15 01:33:27 GMT 2007
On Wed, 2007-11-14 at 19:15 -0600, John Arbash Meinel wrote:
>
>
> This won't be tested by the delta tests, because they only test a
> single
> parent, which doesn't exercise the _discard_merge_parents. However it
> is
> fairly DirState specific, so it just gets direct tests.
Just a note - they *do* exercise dual-parents. LOOK CLOSER.
Just not this precise case (and its such an implementation specific case
they shouldn't have to) :).
-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/20071115/79634073/attachment.pgp
More information about the bazaar
mailing list