[BUG] Can't commit after merging:workaround

[Aaron Bentley]

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

Matthieu Moy wrote:
| 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

Yeah, the workaround is to rsync the remote branch.  The plugin is
straightforward, which is probably appropriate, given its purpose.  But
this means it does want to list directories.

Avoiding that would mean determining the list of file ids
a) by listing the (incomplete?) local text store
b) from the (incomplete?) inventory weave
c) from the complete remote inventory weave

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

Yeah.  That should probably be throwing TransportNotPossible instead.
Though it would be nice if we could take advantage of the fact that many
web servers *do* have directory listings.

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

iD8DBQFDf2Ya0F+nu1YWqI0RAo14AJwIxo8abHj0Fuh9bO2Dp8wYag7+9wCdFjVN
73GLEpHFwqLqmhk877Tn8w4=
=Kd7u
-----END PGP SIGNATURE-----