Bug in reweave

[John A Meinel]

Aaron Bentley wrote:
> 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
> w
> 

Well the specific lines in question are asserting that the two weave
files disagree on the text.
Is this happening that the branch you created the tarball, when you
'pull' from robert's integration, you get the reweave failure?

It isn't very hard to instrument the code a bit to figure out what texts
are disagreeing. I'm testing it right now.
I'm also curious if we would see this with my fix-weave-join changes.

I can say that pulling from my local mirror of Robert's branch I get:

$ cd dev/bzr
$ tar xvjf bzr.integration.tar.bz2
$ cd bzr.integration
$ bzr pull ~/bzr/mirrors/robertc/integration
# Displays some progress, and then hangs for a rather long time

And then I do get the same assertion error.

So I've confirmed it is reproducible even here.

I did still see that it forces a reweave, even after my weave-join fixes.

Right now, it takes about 30min for it to give me the error, so it will
be a while before I track it down. But yes, it does happen.

John
=:->

> $ 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
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060126/b173c0a6/attachment.pgp