[MERGE REVIEW] Revert destroys file contents produced by merge

[Robert Collins]

On Tue, 2006-02-28 at 23:22 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> In the spirit of peace, love, understanding, and arguing about better
> things, I've switched from splatfile to rio, and removed splatfile.
> 
> I've also included a header, as you suggested.
> 
> How does this version look?
> 
> (also in http://code.aaronbentley.com/bzr/bzr.ttransform/)

I'm not sure that test_merge_revert belongs in test_inv.py...

Probably its a working tree format specific test - all working tree
implementations should behave the same way ? (or should only format-3
working trees (those in metadirs) behave like this.

If its all working trees it should be tests/workingtree_implementations;
if its just format 3 trees, it should be in tests/test_workingtree.py
and there should be a matching test for format 2 trees that there
behaviour is unaltered from the 0.7 release.

Whats the impact of a 0.7 client working with a tree that has had this
merge-hashes file written into it? 

Other than those two questions, +1.


Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060301/833c9862/attachment.pgp