[PATCH] blackbox test for revert in subdir

[Aaron Bentley]

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

John Arbash Meinel wrote:
> It seems to me that the fix should be in builtins.internal_tree_files.
> Since that code may be called from other commands.

There's nothing wrong with internal_tree_files, AFAIK.  The problem was
that both tree_files and Merger._set_interesting_files converted their
input from absolute/cwd-relative to tree-relative.  This
double-conversion went unnoticed when cwd==tree root, but in other
directories, this was problematic.

The alternative fix is to remove path conversion from _set_interesting
files.  I've attached a patch.

> It seems that it should look at WorkingTree.open_containing, and fix
> relpath appropriately.

I don't know what you mean.

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

iD8DBQFD1Tm80F+nu1YWqI0RAmyQAJ0X9TFM7UOx29Fr0BqSOlpTXu6HpwCcDO0a
JtvVcvfX7OMNfvnUxErYkmw=
=IuHE
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: revert-revision-subdir-file2.patch
Type: text/x-patch
Size: 4914 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060123/ec5b79ae/attachment.bin