Traceback on commit

[Mark Shuttleworth]

Hey guys, had this happen today:

peregrine% bzr commit -m "Merge RF"             
~/canonical/onezero-ui-cleanup
bzr: ERROR:
exceptions.AssertionError:                                        

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 650,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 612,
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 304,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2109,
in run
    reporter=reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line
238, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line
158, in commit
    revprops=revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 319, in
commit
    self._populate_new_inv()
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 656, in
_populate_new_inv
    path, self.work_tree)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line
1977, in record_entry_contents
    self.repository.get_transaction())
  File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line 208,
in find_previous_heads
    assert candidates[ie.revision] == ie
AssertionError

bzr 0.15.0candidate0 on python 2.5.0.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'commit', '-m', 'Merge RF']

** please send this report to bazaar at lists.ubuntu.com
peregrine% bar st | less                        
~/canonical/onezero-ui-cleanup
zsh: correct 'bar' to 'bzr' [nyae]? y
peregrine% bzr st                               
~/canonical/onezero-ui-cleanup
modified:
  doc/localdomain-setup.txt
  lib/canonical/launchpad/browser/launchpad.py
  lib/canonical/launchpad/templates/main-template.pt
  lib/canonical/launchpad/webapp/configure.zcml
  lib/canonical/launchpad/webapp/tales.py
  lib/canonical/launchpad/zcml/resources.zcml
pending merges:
  Canonical.com Pat... 2007-03-11 [trivial] fix blueprint front page search.
    Canonical.com Pat... 2007-03-10 [trivial] [rs=kiko] add /@@/user to
be t...
    Steve Alexander 2007-03-10 update localdomain-setup.txt for feisty
    Steve Alexander 2007-03-10 add useful cacheing headers to resources
serv...
    Steve Alexander 2007-03-10 add /@@/user to be the same as /@@/person
    Steve Alexander 2007-03-10 include CSS before JS, remove
demonstration o...
    Steve Alexander 2007-03-10 merge from devel
    Canonical.com Pat... 2007-03-10 [trivial] clean up use of product in
LP ...
    Steve Alexander 2007-03-04 first cut of macro:page and macro:pagehas
tal...


-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070312/050286da/attachment.htm