DirState.update_basis_by_delta checks Tree[0]

Martin Pool mbp at canonical.com
Thu May 12 17:46:50 UTC 2011


On 11 May 2011 15:48, John Arbash Meinel <john at arbash-meinel.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I'm trying to understand some failures that I've gotten when trying to
> change pull and update to use "WT.update_basis_by_delta".
>
> Specifically, I get stuff like:
> InconsistentDelta: An inconsistent delta was supplied involving 'c',
> 'c-20110511114127-kuflw3huo8rkozik-2110'
> reason: This was marked as a real delete, but the WT state claims that
> it still exists and is versioned.
>
> What is weird, is that update_basis_by_delta is checking tree[0], which
> is the active working tree, but we are asking it to change the content
> of tree[1] the basis tree.

That sounds like a real bug, and a plausible analysis of it.  There
are some open bugs about InconsistentDeltas so you might be able to
earn epic karma, and also use them to check whether your analysis is
correct.



More information about the bazaar mailing list