[MERGE REVIEW] Revert destroys file contents produced by merge

[Robert Collins]

On Mon, 2006-03-06 at 10:31 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > On Tue, 2006-02-28 at 23:22 -0500, Aaron Bentley wrote:
> > I'm not sure that test_merge_revert belongs in test_inv.py...
> 
> That's where the existing tests of revert were.

Heh. 

> > 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.
> 
> All implementations should behave the same way.

Ok. I'm a little surprised because I thought that we would want to
interoperate on 0.7 managed branches seamlessly, and the tree transform
logic produces different forms of conflicts. As long as its a conscious
decision its all good, and your response below indicates it is.

> > 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.
> 
> I would like a better explanation of these tests that are run across
> varying formats/transports, at some point.  For now, I have moved the
> test into tests/workingtree_implementations/test_workingtree.py.
> Updated patch attached.

ok. I'll draw one up when I get a minute. thumbnail though in case thats
enough:

the _implementations tests test all the implementations of a single
interface. Where the behaviour of a call is defined by the interface,
and is testable within the interface, we should put the tests in the
relevant _implementations subdir.

Where its not testable within the interface - i.e. the actual files and
directories a repository creates are not part of the api - then we
should have specific tests for the relevant implementation in the
tests/test_foo.py file.


could do with a docstring here.

+    def write_modified(self, results):
+        modified_hashes = {}




+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/20060307/3cc987af/attachment.pgp