Assertion error in delta.py (_compare_trees)

[Marius Gedminas]

On Thu, Mar 01, 2007 at 02:24:51AM +0200, Marius Gedminas wrote:
...
> The saga continues: bzr 0.15.0dev0 found a bunch of uncommitted changes
> in my 'upstream' branch.  Naturally, I committed them.  I then attempted
> to merge upstream into the new branch I created today (with bzr 0.11).
> bzr merge succeeds, but then bzr commit barfs:
> 
...
>   File "/home/mg/src/bzr.dev/bzrlib/inventory.py", line 212, in find_previous_heads
>     assert candidates[ie.revision] == ie
> AssertionError
> 
> bzr 0.15.0dev0 on python 2.4.4.candidate.1 (linux2)
> arguments: ['/home/mg/bin/bzr', 'ci']

Any ideas?  I'm kind of sitting here not knowing whether my existing
branches are broken and whether I should start from scratch (I have
cumulative diffs of all my changes, so I'd just lose some history).

Marius Gedminas
-- 
Beware of bugs in the above code; I have only proved it correct, not tried it.
                -- Donald Knuth
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070301/6a449638/attachment-0001.pgp