Bug in reweave

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

When I try to pull on a local copy of Robert's integration, I get this:

The problem is reproduceable.  I've put a tarball up at
http://code.aaronbentley.com/bzr.integration.tar.bz2

$ bzr pull
Using saved location: http://people.ubuntu.com/~robertc/baz2.0/integration
bzr: ERROR: exceptions.AssertionError:
~  at /home/abentley/bzr.ab/bzrlib/weave.py line 927
~  in reweave

Full traceback
[12685] Thu 21:47:04.179 ERROR: exceptions.AssertionError:   at
/home/abentley/bzr.ab/bzrlib/weave.py line 927   in reweave Traceback
(most recent call last):   File
"/home/abentley/bzr.ab/bzrlib/commands.py", line 572, in
run_bzr_catch_errors     return run_bzr(argv)   File
"/home/abentley/bzr.ab/bzrlib/commands.py", line 534, in run_bzr     ret
= cmd_obj.run_argv(argv)   File
"/home/abentley/bzr.ab/bzrlib/commands.py", line 233, in run_argv
return self.run(**all_cmd_args)   File
"/home/abentley/bzr.ab/bzrlib/builtins.py", line 419, in run     count =
tree_to.pull(br_from, overwrite)   File
"/home/abentley/bzr.ab/bzrlib/branch.py", line 90, in decorated
return unbound(self, *args, **kwargs)   File
"/home/abentley/bzr.ab/bzrlib/workingtree.py", line 672, in pull
count = self.branch.pull(source, overwrite)   File
"/home/abentley/bzr.ab/bzrlib/branch.py", line 90, in decorated
return unbound(self, *args, **kwargs)   File
"/home/abentley/bzr.ab/bzrlib/branch.py", line 1102, in pull
self.update_revisions(source)   File
"/home/abentley/bzr.ab/bzrlib/branch.py", line 1046, in update_revisions
~    revision=stop_revision)
~  File "/home/abentley/bzr.ab/bzrlib/fetch.py", line 66, in greedy_fetch
~    f = Fetcher(to_branch, from_branch, revision, pb)
~  File "/home/abentley/bzr.ab/bzrlib/fetch.py", line 115, in __init__
~    self._fetch_inventory_weave(revs)
~  File "/home/abentley/bzr.ab/bzrlib/fetch.py", line 182, in
_fetch_inventory_weave
~    to_weave.reweave(from_weave)
~  File "/home/abentley/bzr.ab/bzrlib/weave.py", line 896, in reweave
~    new_weave = reweave(self, other)
~  File "/home/abentley/bzr.ab/bzrlib/weave.py", line 927, in reweave
~    assert lines == wb.get_lines(name)
AssertionError


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD2Yre0F+nu1YWqI0RAlLuAJ0S8CeURGUNc7PdmqBSxgitVBbVuwCeOJY6
uGVblUZWd2bLF35qdHXqiFs=
=4Arz
-----END PGP SIGNATURE-----