subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcor...@apache.org
Subject svn commit: r1805704 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Mon, 21 Aug 2017 23:05:09 GMT
Author: jcorvel
Date: Mon Aug 21 23:05:08 2017
New Revision: 1805704

URL: http://svn.apache.org/viewvc?rev=1805704&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
  (test_cherry_pick_post_move_edit): Correct expectation of this XFAILing
   test to make it easier to see what's really missing with this use case.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1805704&r1=1805703&r2=1805704&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Mon Aug 21 23:05:08 2017
@@ -4634,7 +4634,6 @@ test_cherry_pick_post_move_edit(const sv
     svn_client_conflict_option_id_t expected_opts[] = {
       svn_client_conflict_option_postpone,
       svn_client_conflict_option_accept_current_wc_state,
-      svn_client_conflict_option_local_move_file_text_merge,
       -1 /* end of list */
     };
     SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,



Mime
View raw message