<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffcc" text="#000000">
Hey guys, had this happen today:<br>
<br>
peregrine% bzr commit -m "Merge RF"
~/canonical/onezero-ui-cleanup<br>
bzr: ERROR:
exceptions.AssertionError: <br>
<br>
Traceback (most recent call last):<br>
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 650,
in run_bzr_catch_errors<br>
return run_bzr(argv)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 612,
in run_bzr<br>
ret = run(*run_argv)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 304,
in run_argv_aliases<br>
return self.run(**all_cmd_args)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line
2109, in run<br>
reporter=reporter)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
165, in write_locked<br>
return unbound(self, *args, **kwargs)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line
238, in commit<br>
result = WorkingTree3.commit(self, message, revprops, *args,
**kwargs)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line
165, in write_locked<br>
return unbound(self, *args, **kwargs)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line
158, in commit<br>
revprops=revprops, *args, **kwargs)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 319,
in commit<br>
self._populate_new_inv()<br>
File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 656,
in _populate_new_inv<br>
path, self.work_tree)<br>
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line
1977, in record_entry_contents<br>
self.repository.get_transaction())<br>
File "/usr/lib/python2.5/site-packages/bzrlib/inventory.py", line
208, in find_previous_heads<br>
assert candidates[ie.revision] == ie<br>
AssertionError<br>
<br>
bzr 0.15.0candidate0 on python 2.5.0.final.0 (linux2)<br>
arguments: ['/usr/bin/bzr', 'commit', '-m', 'Merge RF']<br>
<br>
** please send this report to <a class="moz-txt-link-abbreviated" href="mailto:bazaar@lists.ubuntu.com">bazaar@lists.ubuntu.com</a><br>
peregrine% bar st | less
~/canonical/onezero-ui-cleanup<br>
zsh: correct 'bar' to 'bzr' [nyae]? y<br>
peregrine% bzr st
~/canonical/onezero-ui-cleanup<br>
modified:<br>
doc/localdomain-setup.txt<br>
lib/canonical/launchpad/browser/launchpad.py<br>
lib/canonical/launchpad/templates/main-template.pt<br>
lib/canonical/launchpad/webapp/configure.zcml<br>
lib/canonical/launchpad/webapp/tales.py<br>
lib/canonical/launchpad/zcml/resources.zcml<br>
pending merges:<br>
Canonical.com Pat... 2007-03-11 [trivial] fix blueprint front page
search.<br>
Canonical.com Pat... 2007-03-10 [trivial] [rs=kiko] add /@@/user to
be t...<br>
Steve Alexander 2007-03-10 update localdomain-setup.txt for feisty<br>
Steve Alexander 2007-03-10 add useful cacheing headers to resources
serv...<br>
Steve Alexander 2007-03-10 add /@@/user to be the same as /@@/person<br>
Steve Alexander 2007-03-10 include CSS before JS, remove
demonstration o...<br>
Steve Alexander 2007-03-10 merge from devel<br>
Canonical.com Pat... 2007-03-10 [trivial] clean up use of product
in LP ...<br>
Steve Alexander 2007-03-04 first cut of macro:page and
macro:pagehas tal...<br>
<br>
<br>
</body>
</html>