[MERGE] commit of removals respects filespec (fixes #46635)

[Aaron Bentley]

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

Hi all,

Currently, commit doesn't respect the file spec for file removals.  This
is different from deletions, which are already handled properly.

The reason is that the code that populates the new inventory iterates
through the working tree only.  The difference between a deletion and a
removal is that a deletion does have an entry in the working tree (just
no contents).  Since deletions do have an entry in the working tree,
they are handled correctly.

This patch causes the basis tree to be scanned for unselected removals,
which are then added to the new inventory.

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

iD8DBQFEs7970F+nu1YWqI0RAoc1AJ9B1jZ0PJbzzA5Nf9dQ5R0WTMfwmQCeL4Kx
1IGJmQUvth/Kd3DPui1SkOw=
=wHDu
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: commit-removals-filespec.patch
Type: text/x-patch
Size: 4776 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060711/116ff48b/attachment.bin