Comment 7 for bug 161131

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 161131] Re: dirstate file gets confused in merge aftermath

On Tue, 2007-11-13 at 23:41 +0000, John A Meinel wrote:
> It seems the problem is that 'update_basis_by_delta' is deleting the
> 'b/' directory, but leaving the 'b/b' file.
>
> At the moment, I only see 'update_basis_by_delta' tests testing a single
> parent.

There are two relevant tests here - test_removes - tests for the b/b
case. And test_content_from _second_parent_is_dropped which tests the
two-parent case, but certainly not exhaustively. Note that the
implementation starts by doing self._discard_merge_parents. Possibly
that is borked; but it should be possible to eliminate that promptly
(and it looks fine to me).

> I wonder if that isn't the problem.
>
> It is also certainly an interaction between the 'WT.unversion()'
> followed by 'WT.update_basis_by_delta'.

Interesting. I don't know that the interface tests test this
interaction; though I would have thought they do.

> To this point, I haven't tracked down the specific cause, but I figured
> I would give an update on progress.

-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.