[MERGE] Implement the oft-discussed automatic-add-and-delete at commit time.

[Robert Collins]

This fixes bug 5158; its been talked about for way too long - so here's
a patch to do it. This may break some history converters that were slack
about deletes, but I don't think so. The largest problem I anticipate is
surprising users - perhaps there is doco to update that I missed as
well?

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 5158-3604.patch
Type: text/x-patch
Size: 32208 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080805/e200f226/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080805/e200f226/attachment-0001.pgp