[MERGE REVIEW] Revert destroys file contents produced by merge

[Aaron Bentley]

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

Hi all,

I've gotten merge and revert to collaborate so that when you revert a
merge, it doesn't leave any junk behind.

Files whose contents were modified by merge are deleted without being
backed up.  Files that were added by merge are deleted instead of being
unversioned.

However, if the files are modified afterward by the user, then revert
will handle them normally.

This is done my producing a list of hashes of merge-produced contents,
in the new splatfile format.

This file is not specified for existing tree formats, but will be
harmlessly ignored if present.

This also introduces the splatfile format, a very simple format for
representing lists of lists of unicode strings.

Advantages over rio:
 - all unicode strings are legal values
 - very simple API
 - aside from header, 1-to-1 correspondance between lines and stanzas
 - escaping built-in and minimal.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD/4as0F+nu1YWqI0RAgHyAJ49roYLtL7nSh/73FbP0xbukMtWOgCeMvb+
vw1sX1qdbvOM6vYks05dvkg=
=IrXh
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nicerevert.patch
Type: text/x-patch
Size: 15128 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060224/2cef8d6a/attachment.bin