[MERGE REVIEW] Revert destroys file contents produced by merge

[Robey Pointer]

On 24 Feb 2006, at 14:20, Aaron Bentley wrote:

> 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.

+1 from me.

So this is just a temporary file that will get overwritten with  
subsequent merges?  (I didn't see anywhere that the file was removed  
once it was written.)

robey