You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/04 23:53:10 UTC
svn commit: r1538796 -
/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Author: rhuijben
Date: Mon Nov 4 22:53:10 2013
New Revision: 1538796
URL: http://svn.apache.org/r1538796
Log:
* subversion/tests/libsvn_wc/op-depth-test.c
(del4_update_delself_AAA): Manually resolve all conflicts to avoid
a limitation of the currenct conflict resolver.
(move4_update_delself_AAA): Manually resolve some conflicts until we
hit the real error.
(test_funcs): Remove XFail marker from del4_update_delself_AAA.
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=1538796&r1=1538795&r2=1538796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Mon Nov 4 22:53:10 2013
@@ -8915,6 +8915,21 @@ del4_update_delself_AAA(const svn_test_o
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));
+
+ /* Resolve a few conflicts manually */
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "C/A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+
+ /* ### These can currently only be resolved to merged ???? */
+ SVN_ERR(sbox_wc_resolve(&b, "D/A/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+ SVN_ERR(sbox_wc_resolve(&b, "A/A/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+
SVN_ERR(sbox_wc_resolve(&b, "", svn_depth_infinity, svn_wc_conflict_choose_mine_conflict));
/* Go back to start position */
SVN_ERR(sbox_wc_update(&b, "", 1));
@@ -8995,6 +9010,20 @@ move4_update_delself_AAA(const svn_test_
/* Update and resolve via mine strategy */
SVN_ERR(sbox_wc_update(&b, "", 2));
+
+ /* Resolve a few conflicts manually */
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "C/A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+
+ /* ### These can currently only be resolved to merged ???? */
+ SVN_ERR(sbox_wc_resolve(&b, "D/A/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+ SVN_ERR(sbox_wc_resolve(&b, "A/A/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
SVN_ERR(sbox_wc_resolve(&b, "", svn_depth_infinity, svn_wc_conflict_choose_mine_conflict));
/* Go back to start position */
SVN_ERR(sbox_wc_update(&b, "", 1));
@@ -9300,7 +9329,7 @@ struct svn_test_descriptor_t test_funcs[
"del4: delete AAA"),
SVN_TEST_OPTS_PASS(del4_update_add_AAA,
"del4: add AAA"),
- SVN_TEST_OPTS_XFAIL(del4_update_delself_AAA,
+ SVN_TEST_OPTS_PASS(del4_update_delself_AAA,
"del4: delete self AAA"),
SVN_TEST_OPTS_PASS(move4_update_edit_AAA,
"move4: edit AAA"),