Author: julianfoad
Date: Wed Aug 25 16:51:35 2010
New Revision: 989218
URL: http://svn.apache.org/viewvc?rev=989218&view=rev
Log:
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(disk_after_leaf_edit, disk_after_leaf_del, disk_after_tree_del):
Rename from state_after_leaf_edit, state_after_leaf_del and
state_after_tree_del respectively, for consistency with other
test files that define these same aliases. Update all references.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=989218&r1=989217&r2=989218&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Wed
Aug 25 16:51:35 2010
@@ -799,9 +799,9 @@ leaf_edit = svntest.actions.deep_trees_l
tree_del = svntest.actions.deep_trees_tree_del
leaf_del = svntest.actions.deep_trees_leaf_del
-state_after_leaf_edit = svntest.actions.deep_trees_after_leaf_edit
-state_after_leaf_del = svntest.actions.deep_trees_after_leaf_del
-state_after_tree_del = svntest.actions.deep_trees_after_tree_del
+disk_after_leaf_edit = svntest.actions.deep_trees_after_leaf_edit
+disk_after_leaf_del = svntest.actions.deep_trees_after_leaf_del
+disk_after_tree_del = svntest.actions.deep_trees_after_tree_del
deep_trees_conflict_output = svntest.actions.deep_trees_conflict_output
@@ -824,7 +824,7 @@ def tree_conflicts_on_merge_local_ci_4_1
expected_output = deep_trees_conflict_output
- expected_disk = state_after_tree_del
+ expected_disk = disk_after_tree_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -861,7 +861,7 @@ def tree_conflicts_on_merge_local_ci_4_2
expected_output = deep_trees_conflict_output
- expected_disk = state_after_tree_del
+ expected_disk = disk_after_tree_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -900,7 +900,7 @@ def tree_conflicts_on_merge_local_ci_5_1
expected_output = deep_trees_conflict_output
- expected_disk = state_after_leaf_edit
+ expected_disk = disk_after_leaf_edit
# We should detect 6 tree conflicts, and nothing should be deleted (when
# we skip tree conflict victims).
@@ -998,7 +998,7 @@ def tree_conflicts_on_merge_local_ci_6(s
expected_output = deep_trees_conflict_output
- expected_disk = state_after_tree_del
+ expected_disk = disk_after_tree_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1145,7 +1145,7 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = state_after_leaf_edit
+ expected_disk = disk_after_leaf_edit
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1303,7 +1303,7 @@ def tree_conflicts_merge_edit_onto_missi
expected_output = wc.State('', {
})
- expected_disk = state_after_tree_del
+ expected_disk = disk_after_tree_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev=3),
@@ -1377,7 +1377,7 @@ def tree_conflicts_merge_del_onto_missin
expected_output = wc.State('', {
})
- expected_disk = state_after_tree_del
+ expected_disk = disk_after_tree_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev=3),
