Author: julianfoad
Date: Wed Feb 27 02:25:06 2013
New Revision: 1450582
URL: http://svn.apache.org/r1450582
Log:
Test tree conflicts with an incoming replacement on 'switch'. This follows
r1449428 which started testing tree conflicts with an incoming replacement
on 'update', and then r1449413 which fixed 'switch' to notice ancestry like
'update' does so that it too can detect tree conflicts in these scenarios.
* subversion/tests/cmdline/tree_conflict_tests.py
(up_sw_file_del_onto_mod,
up_sw_file_del_onto_del,
up_sw_dir_del_onto_mod,
up_sw_dir_del_onto_del): Test incoming replacements with 'switch' just
like we already do with 'update', and remove the comment about why we
were not doing so.
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1450582&r1=1450581&r2=1450582&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Wed Feb 27
02:25:06 2013
@@ -573,10 +573,7 @@ def up_sw_file_del_onto_mod(sbox):
sbox2 = sbox.clone_dependent()
ensure_tree_conflict(sbox, 'update', f_dels + f_moves + f_rpls,
f_mods)
- # For 'switch', don't test with incoming replacements because 'switch'
- # ignores ancestry in its repos diff (unlike 'update') and so does not
- # notice replacements.
- ensure_tree_conflict(sbox2, 'switch', f_dels + f_moves,
+ ensure_tree_conflict(sbox2, 'switch', f_dels + f_moves + f_rpls,
f_mods)
# Note: See UC2 in notes/tree-conflicts/use-cases.txt.
@@ -585,7 +582,7 @@ def up_sw_file_del_onto_del(sbox):
sbox2 = sbox.clone_dependent()
ensure_tree_conflict(sbox, 'update', f_dels + f_moves + f_rpls,
f_dels + f_rpls)
- ensure_tree_conflict(sbox2, 'switch', f_dels + f_moves,
+ ensure_tree_conflict(sbox2, 'switch', f_dels + f_moves + f_rpls,
f_dels + f_rpls)
# Note: See UC3 in notes/tree-conflicts/use-cases.txt.
@@ -615,7 +612,7 @@ def up_sw_dir_del_onto_mod(sbox):
sbox2 = sbox.clone_dependent()
ensure_tree_conflict(sbox, 'update', d_dels + d_moves + d_rpls,
d_mods)
- ensure_tree_conflict(sbox2, 'switch', d_dels + d_moves,
+ ensure_tree_conflict(sbox2, 'switch', d_dels + d_moves + d_rpls,
d_mods)
def up_sw_dir_del_onto_del(sbox):
@@ -624,7 +621,7 @@ def up_sw_dir_del_onto_del(sbox):
sbox2 = sbox.clone_dependent()
ensure_tree_conflict(sbox, 'update', d_dels + d_moves + d_rpls,
d_dels + d_rpls)
- ensure_tree_conflict(sbox2, 'switch', d_dels + d_moves,
+ ensure_tree_conflict(sbox2, 'switch', d_dels + d_moves + d_rpls,
d_dels + d_rpls)
# This is currently set as XFail over ra_dav because it hits
