Assertion error in delta.py (_compare_trees)

[Marius Gedminas]

Introduction (feel free to skip it):

    I have a couple of bzr branches on my laptop, mirrored at
    http://mg.pov.lt/fbreader/

    Today I created a new branch, commited a few changes and tried to
    merge it into my mongo-contains-everything branch.  bzr 0.11 (Ubuntu
    edgy) barfed on me, bzr st in that branch also started barfing
    errors after the failed merge.  I decided that 0.11 was far from the
    latest release, so I moved the corrupted branch away, scp'ed over a
    fresh copy from the public mirror, and upgraded bzr to 0.14 from
    http://bazaar-vcs.org/releases/debs/.

I cannot even run bzr st in any of the old branches that I had:

    mg at pitonas:~/www/fbreader/mg $ bzr st
    bzr: ERROR: exceptions.AssertionError: 

    Traceback (most recent call last):
    File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 650, in run_bzr_catch_errors
        return run_bzr(argv)
    File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 612, in run_bzr
        ret = run(*run_argv)
    File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 304, in run_argv_aliases
        return self.run(**all_cmd_args)
    File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 622, in ignore_pipe
        result = func(*args, **kwargs)
    File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 171, in run
        short=short)
    File "/usr/lib/python2.4/site-packages/bzrlib/status.py", line 139, in show_tree_status
        specific_files=specific_files)
    File "/usr/lib/python2.4/site-packages/bzrlib/tree.py", line 87, in changes_from
        include_root=include_root
    File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 38, in read_locked
        return unbound(self, *args, **kwargs)
    File "/usr/lib/python2.4/site-packages/bzrlib/tree.py", line 460, in compare
        specific_file_ids, include_root)
    File "/usr/lib/python2.4/site-packages/bzrlib/delta.py", line 187, in _compare_trees
        assert kind[0] == kind[1] or None in kind
    AssertionError

    bzr 0.14.0 on python 2.4.4.candidate.1 (linux2)
    arguments: ['/usr/bin/bzr', 'st']

    ** please send this report to bazaar at lists.ubuntu.com

bzr st works, however, on the new branch I cloned today.

bzr check finds no errors:

    checked branch file:///home/mg/www/fbreader/mg/ format Bazaar-NG Metadir branch format 5
    checked repository <bzrlib.transport.local.LocalTransport url=file:///home/mg/www/fbreader/mg/> format <RepositoryFormatKnit1>
        33 revisions
    1511 unique file texts
    22608 repeated file texts
    1135 weaves

Help!

(FWIW the error during merge that bzr 0.11 gave me was BzrCheckError:
Internal check failed: file
u'/home/mg/www/fbreader/mg/fbreader/opensimpad-0.9.0' entered as kind
'symlink' id 'opensimpad0.9.0-20060809170006-33d4eedf9209ebe4', now of
kind 'directory'.  Subsequent runs of bzr st in that branch gave the
same error.)

Marius Gedminas
-- 
Un*x admins know what they are doing by definition.
	-- Bernd Petrovitsch
-------------- 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/3d401b6c/attachment-0001.pgp