subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1779360 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Wed, 18 Jan 2017 17:44:23 GMT
Author: stsp
Date: Wed Jan 18 17:44:23 2017
New Revision: 1779360

URL: http://svn.apache.org/viewvc?rev=1779360&view=rev
Log:
Fix test fallout from r1779357:

* subversion/libsvn_client/conflicts-test.c
  (create_wc_with_dir_add_vs_dir_add_update_conflict): Add the new resolver
   option for merging a locally added dir with an incoming one to the list
   of expected options.

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=1779360&r1=1779359&r2=1779360&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Wed Jan 18 17:44:23 2017
@@ -4128,6 +4128,7 @@ create_wc_with_dir_add_vs_dir_add_update
       svn_client_conflict_option_postpone,
       svn_client_conflict_option_accept_current_wc_state,
       svn_client_conflict_option_incoming_add_ignore,
+      svn_client_conflict_option_incoming_added_dir_merge,
       -1 /* end of list */
     };
     SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
@@ -4140,6 +4141,7 @@ create_wc_with_dir_add_vs_dir_add_update
       svn_client_conflict_option_postpone,
       svn_client_conflict_option_accept_current_wc_state,
       svn_client_conflict_option_incoming_add_ignore,
+      svn_client_conflict_option_incoming_added_dir_merge,
       -1 /* end of list */
     };
     SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,



Mime
View raw message