subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1211792 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Date Thu, 08 Dec 2011 09:48:42 GMT
Author: philip
Date: Thu Dec  8 09:48:42 2011
New Revision: 1211792

URL: http://svn.apache.org/viewvc?rev=1211792&view=rev
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (move_on_move): Simplify to avoid ambiguous XFAIL.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1211792&r1=1211791&r2=1211792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Dec  8 09:48:42 2011
@@ -4289,49 +4289,42 @@ move_on_move(const svn_test_opts_t *opts
   SVN_ERR(wc_commit(&b, ""));
   SVN_ERR(wc_update(&b, "", 1));
 
-  SVN_ERR(wc_move(&b, "A/B", "A/B2"));
-  SVN_ERR(wc_move(&b, "A", "A2"));
+  SVN_ERR(wc_move(&b, "A/B", "B2"));
+  SVN_ERR(wc_delete(&b, "A"));
   SVN_ERR(wc_copy(&b, "X", "A"));
 
   {
-    /* Perhaps this should XFAIL on 1,A2/B,"normal" not being MOVED_HERE? */
     nodes_row_t nodes[] = {
       {0, "",         "normal",       1, ""},
-      {0, "A",        "normal",       1, "A",     FALSE, "A2"},
-      {0, "A/B",      "normal",       1, "A/B",   FALSE, "A2/B2"},
+      {0, "A",        "normal",       1, "A"},
+      {0, "A/B",      "normal",       1, "A/B", FALSE, "B2"},
       {0, "X",        "normal",       1, "X"},
       {0, "X/B",      "normal",       1, "X/B"},
+      {1, "B2",       "normal",       1, "A/B", MOVED_HERE},
       {1, "A",        "normal",       1, "X"},
       {1, "A/B",      "normal",       1, "X/B"},
-      {1, "A2",       "normal",       1, "A",     MOVED_HERE},
-      {1, "A2/B",     "normal",       1, "A/B"},
-      {2, "A2/B",     "base-deleted", NO_COPY_FROM},
-      {2, "A2/B2",    "normal",       1, "A/B",   MOVED_HERE},
       {0}
     };
     SVN_ERR(check_db_rows(&b, "", nodes));
   }
 
-  /* A/B to A2/B2 is already recorded in A/B but the copy has given us
+  /* A/B to B2 is already recorded in A/B but the copy has given us
      another A/B that we can move.  A second move overwites the first
      move stored in A/B even though it's a different node being moved,
-     and that breaks the recording of the move to A2/B2. */
-  SVN_ERR(wc_move(&b, "A/B", "A/B3"));
+     and that breaks the recording of the move to B2. */
+  SVN_ERR(wc_move(&b, "A/B", "B3"));
   {
     nodes_row_t nodes[] = {
       {0, "",         "normal",       1, ""},
-      {0, "A",        "normal",       1, "A",     FALSE, "A2"},
-      {0, "A/B",      "normal",       1, "A/B",   FALSE, "A2/B2"}, /* XFAIL */
+      {0, "A",        "normal",       1, "A"},
+      {0, "A/B",      "normal",       1, "A/B",   FALSE, "B2"}, /* XFAIL */
       {0, "X",        "normal",       1, "X"},
       {0, "X/B",      "normal",       1, "X/B"},
+      {1, "B2",       "normal",       1, "A/B",   MOVED_HERE},
+      {1, "B3",       "normal",       1, "X/B",   MOVED_HERE},
       {1, "A",        "normal",       1, "X"},
       {1, "A/B",      "normal",       1, "X/B"},
-      {1, "A2",       "normal",       1, "A",     MOVED_HERE},
-      {1, "A2/B",     "normal",       1, "A/B"},
-      {2, "A2/B",     "base-deleted", NO_COPY_FROM},
-      {2, "A2/B2",    "normal",       1, "A/B",   MOVED_HERE},
       {2, "A/B",      "base-deleted", NO_COPY_FROM},
-      {2, "A/B3",     "normal",       1, "X/B",   MOVED_HERE},
       {0}
     };
     SVN_ERR(check_db_rows(&b, "", nodes));



Mime
View raw message