You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/02/08 19:11:36 UTC
svn commit: r1242028 -
/subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
Author: stsp
Date: Wed Feb 8 18:11:35 2012
New Revision: 1242028
URL: http://svn.apache.org/viewvc?rev=1242028&view=rev
Log:
On the multi-layer-moves branch, adjust expectations of some op-depth
tests to conform to the current state of the multi-layer-move design
(see http://wiki.apache.org/subversion/MultiLayerMoves).
This commit deliberately makes the affected tests fail.
Some other tests are already failing.
* subversion/tests/libsvn_wc/op-depth-test.c
(test_wc_move, nested_moves_child_first, nested_moves_child_last): Adjust
test expectations. For nested moves, moved_to information is stored at
the base-deleted node within the copied-half of the parent move, rather
than at the base-deleted child node within the parent move's delete-half.
Modified:
subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c?rev=1242028&r1=1242027&r2=1242028&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c Wed Feb 8 18:11:35 2012
@@ -1729,10 +1729,10 @@ test_wc_move(const svn_test_opts_t *opts
{ 0, "A/B", "normal", 1, "A/B"},
{ 0, "A/B/C", "normal", 1, "A/B/C"},
{ 2, "A/B", "base-deleted", NO_COPY_FROM, FALSE, "A/B-move" },
- { 2, "A/B/C", "base-deleted", NO_COPY_FROM, FALSE, "A/B-move/C-move" },
+ { 2, "A/B/C", "base-deleted", NO_COPY_FROM},
{ 2, "A/B-move", "normal", 1, "A/B", MOVED_HERE },
{ 2, "A/B-move/C", "normal", 1, "A/B/C", MOVED_HERE },
- { 3, "A/B-move/C", "base-deleted", NO_COPY_FROM },
+ { 3, "A/B-move/C", "base-deleted", NO_COPY_FROM, FALSE, "A/B-move/C-move" },
{ 3, "A/B-move/C-move", "normal", 1, "A/B/C", MOVED_HERE },
{ 0 }
};
@@ -3788,10 +3788,10 @@ nested_moves_child_first(const svn_test_
{0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
{2, "A/B", "base-deleted", NO_COPY_FROM, FALSE, "A/B2"},
- {2, "A/B/C", "base-deleted", NO_COPY_FROM, FALSE, "A/B2/C2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
{2, "A/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
- {3, "A/B2/C", "base-deleted", NO_COPY_FROM},
+ {3, "A/B2/C", "base-deleted", NO_COPY_FROM, FALSE, "A/B2/C2"},
{3, "A/B2/C2", "normal", 1, "A/B/C", MOVED_HERE},
{0}
};
@@ -3805,16 +3805,16 @@ nested_moves_child_first(const svn_test_
{0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
{1, "A", "base-deleted", NO_COPY_FROM, FALSE, "A2"},
- {1, "A/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
- {1, "A/B/C", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2/C2"},
+ {1, "A/B", "base-deleted", NO_COPY_FROM},
+ {1, "A/B/C", "base-deleted", NO_COPY_FROM},
{1, "A2", "normal", 1, "A", MOVED_HERE},
{1, "A2/B", "normal", 1, "A/B", MOVED_HERE},
{1, "A2/B/C", "normal", 1, "A/B/C", MOVED_HERE},
- {2, "A2/B", "base-deleted", NO_COPY_FROM},
+ {2, "A2/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
{2, "A2/B/C", "base-deleted", NO_COPY_FROM},
{2, "A2/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A2/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
- {3, "A2/B2/C", "base-deleted", NO_COPY_FROM},
+ {3, "A2/B2/C", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2/C2"},
{3, "A2/B2/C2","normal", 1, "A/B/C", MOVED_HERE},
{0}
};
@@ -3892,12 +3892,12 @@ nested_moves_child_last(const svn_test_o
{0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
{1, "A", "base-deleted", NO_COPY_FROM, FALSE, "A2"},
- {1, "A/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
+ {1, "A/B", "base-deleted", NO_COPY_FROM},
{1, "A/B/C", "base-deleted", NO_COPY_FROM},
{1, "A2", "normal", 1, "A", MOVED_HERE},
{1, "A2/B", "normal", 1, "A/B", MOVED_HERE},
{1, "A2/B/C", "normal", 1, "A/B/C", MOVED_HERE},
- {2, "A2/B", "base-deleted", NO_COPY_FROM},
+ {2, "A2/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
{2, "A2/B/C", "base-deleted", NO_COPY_FROM},
{2, "A2/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A2/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
@@ -3913,16 +3913,16 @@ nested_moves_child_last(const svn_test_o
{0, "A/B", "normal", 1, "A/B"},
{0, "A/B/C", "normal", 1, "A/B/C"},
{1, "A", "base-deleted", NO_COPY_FROM, FALSE, "A2"},
- {1, "A/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
- {1, "A/B/C", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2/C2"},
+ {1, "A/B", "base-deleted", NO_COPY_FROM, FALSE},
+ {1, "A/B/C", "base-deleted", NO_COPY_FROM, FALSE},
{1, "A2", "normal", 1, "A", MOVED_HERE},
{1, "A2/B", "normal", 1, "A/B", MOVED_HERE},
{1, "A2/B/C", "normal", 1, "A/B/C", MOVED_HERE},
- {2, "A2/B", "base-deleted", NO_COPY_FROM},
+ {2, "A2/B", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2"},
{2, "A2/B/C", "base-deleted", NO_COPY_FROM},
{2, "A2/B2", "normal", 1, "A/B", MOVED_HERE},
{2, "A2/B2/C", "normal", 1, "A/B/C", MOVED_HERE},
- {3, "A2/B2/C", "base-deleted", NO_COPY_FROM},
+ {3, "A2/B2/C", "base-deleted", NO_COPY_FROM, FALSE, "A2/B2/C2"},
{3, "A2/B2/C2","normal", 1, "A/B/C", MOVED_HERE},
{0}
};