svn commit: r1300512 - /subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c

[ph...@apache.org]

Author: philip
Date: Wed Mar 14 11:43:19 2012
New Revision: 1300512

URL: http://svn.apache.org/viewvc?rev=1300512&view=rev
Log:
On multi-layer-move branch, fix a test that requires multi-layered moves.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_on_move): Adjust expectations.

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=1300512&r1=1300511&r2=1300512&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 Mar 14 11:43:19 2012
@@ -4439,17 +4439,13 @@ move_on_move2(const svn_test_opts_t *opt
       {0, "X/B",      "normal",       1, "X/B"},
       {1, "A2",       "normal",       1, "A",   MOVED_HERE},
       {1, "A2/B",     "normal",       1, "A/B", MOVED_HERE},
-      {1, "A",        "normal",       1, "X"},
+      {1, "A",        "normal",       1, "X", FALSE, "A2"},
       {1, "A/B",      "normal",       1, "X/B"},
       {0}
     };
     SVN_ERR(check_db_rows(&b, "", nodes));
   }
 
-  /* A/B is already moved to A2/B but there is no explicit moved_to,
-     we derive it from A.  The copy has given us another A/B that we
-     can move doing so stores explicit moved_to in A/B that breaks the
-     recording of the first move to A2/B. */
   SVN_ERR(wc_move(&b, "A/B", "B3"));
   {
     nodes_row_t nodes[] = {
@@ -4461,7 +4457,7 @@ move_on_move2(const svn_test_opts_t *opt
       {1, "A2",       "normal",       1, "A",   MOVED_HERE},
       {1, "A2/B",     "normal",       1, "A/B", MOVED_HERE},
       {1, "B3",       "normal",       1, "X/B", MOVED_HERE},
-      {1, "A",        "normal",       1, "X"},
+      {1, "A",        "normal",       1, "X", FALSE, "A2"},
       {1, "A/B",      "normal",       1, "X/B"},
       {2, "A/B",      "base-deleted", NO_COPY_FROM, "B3"},
       {0}
@@ -4595,7 +4591,7 @@ struct svn_test_descriptor_t test_funcs[
                        "revert_nested_move"),
     SVN_TEST_OPTS_PASS(move_on_move,
                        "move_on_move"),
-    SVN_TEST_OPTS_XFAIL(move_on_move2,
+    SVN_TEST_OPTS_PASS(move_on_move2,
                        "move_on_move2"),
     SVN_TEST_OPTS_XFAIL(move_added,
                        "move_added"),