[PATCH] Merge-rename bug

[Aaron Bentley]

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

Here's a patch that fixes a bug with renames: when files were renamed,
their merge entries weren't being created properly, because I was
supplying a filename where a file path was expected.

Unfortunately, the test suite doesn't reproduce this problem, because it
generates changesets manually, and this produces slightly different
merge changesets.  Attempts to fix the test suite have failed so far.

I am not certain whether it makes sense to continue separating changeset
generation and merging like this.

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

iD8DBQFC0qmz0F+nu1YWqI0RAvXyAJwNmSQ5RoAoL8lL15k39xXMsmTWHwCeKG+r
y7qCFwwwouYv5Gg4SDPNJ7c=
=GQBX
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-renames.patch
Type: text/x-patch
Size: 2111 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050711/bb606b0b/attachment.bin