Tree conflicts test harness
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 14 May 2008 13:17:50 +0100
For those interested in tree conflicts...
I started a test harness in [branches/tree-conflicts/]
Steve Butler wrote up a good description of it in [trunk/]
[[[
The following tests fail because they expect a property change to
Test 5 "up/sw dir: modify onto del/rpl/mv"
There is a strange error ("Revision 3 doesn't match existing revision
Test 7 "up/sw dir: del/rpl/mv onto del/rpl/mv"
For consistency's sake, I suggest a few changes to the actions scheme:
1. Rename _T to _t.
2. Simplify _A. It should just run 'svn add'. If the item does not
3. The propset done by _A doesn't seem useful, because the property
These changes will require updating the scenario data, of course.
The following features are sketched out in the scenario data, but not
Obstructions
Replacement (file->file, dir->dir)
'svn switch'
'svn merge', where the merge diff is not the same as the working
The current implementation of ensure_tree_conflict() works with only
I agree with Stephen's improvements to the actions scheme (1,2,3) and I'll look
Any input is welcomed, as we want to get this branch ready to merge to trunk soon.
Thanks.
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.