subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1658746 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Date Tue, 10 Feb 2015 16:09:49 GMT
Author: rhuijben
Date: Tue Feb 10 16:09:49 2015
New Revision: 1658746

URL: http://svn.apache.org/r1658746
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
  (move_in_delete): Update expected result and document why.
  (test_list): Mark move_in_delete XFail as it tries to store
    invalid information in a tree conflict.

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=1658746&r1=1658745&r2=1658746&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Feb 10 16:09:49 2015
@@ -6313,8 +6313,13 @@ move_in_delete(const svn_test_opts_t *op
       {0}
     };
     conflict_info_t conflicts[] = {
+      /* ### The src_op_root path (=delete root) is currently A/B,
+             but A/B is no longer modified after the revert.
+
+             This tree conflict should report A/B/C, as that is the
+             deleted ancestor*/
       {"A/B/C", FALSE, FALSE, {svn_wc_conflict_action_edit,
-                               svn_wc_conflict_reason_moved_away, "A/B"}},
+                               svn_wc_conflict_reason_moved_away, "A/B/C"}},
       {0}
     };
     SVN_ERR(check_db_rows(&b, "", nodes));
@@ -10928,7 +10933,7 @@ static struct svn_test_descriptor_t test
                        "move_update_delete_mods"),
     SVN_TEST_OPTS_PASS(nested_moves2,
                        "nested_moves2"),
-    SVN_TEST_OPTS_PASS(move_in_delete,
+    SVN_TEST_OPTS_XFAIL(move_in_delete,
                        "move_in_delete (issue 4303)"),
     SVN_TEST_OPTS_PASS(switch_move,
                        "switch_move"),



Mime
View raw message