[BUG] Can't commit after merging:workaround

[Matthieu Moy]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> There is a workaround for this bug:
> Martin's reweave-branches plugin can identify and recover missing file
> texts, if you point it at a branch that contains the full texts.
>
> I've pushed an updated version of this plugin to
> http://panoramicfeedback.com/opensource/bzr/reweave-branches/

Is there a workaround for the bug in the workaround ;-) ?

$ bzr reweave-branches http://bazaar-ng.org/bzr/bzr.dev .
bzr: ERROR: exceptions.NotImplementedError: 
  at /net/ecrins/local/moy/usr/src/bzr.dev/bzrlib/transport/__init__.py line 177
  in iter_files_recursive

(I suppose reweave-branches needs directory listing and therefore
doesn't work on HTTP)

I've "bzr branch"-ed a local tree from
http://bazaar-ng.org/bzr/bzr.dev. First time, the "branch" operation
itself gave me the same error message

  bzr: ERROR: Revision {robertc at robertcollins.net-20050919060519-f582f62146b0b458} not present in <bzrlib.weave.Weave object at 0xb65f7ddc>

But I did it again and it now works (bzr reweave-branches + bzr
commit).

Thanks,

-- 
Matthieu