Author: stsp
Date: Sun Nov 18 19:35:33 2018
New Revision: 1846855
URL: http://svn.apache.org/viewvc?rev=1846855&view=rev
Log:
Follow-up to r1846851: Fix test expectations.
I missed a failing test which didn't expect to see an 'ignore deletion'
option, which is now made available due to a minor change in r1846851.
* subversion/iibsvn_client/conflicts-test.c
(test_merge_incoming_delete_vs_local_delete): Expect the 'ignore deletion'
option to show up. The new logic to toggle this option since r1846851
may need more consideration, but the providing the option isn't harmful
so make this test expect it for now.
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=1846855&r1=1846854&r2=1846855&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sun Nov 18
19:35:33 2018
@@ -2626,6 +2626,7 @@ test_merge_incoming_delete_vs_local_dele
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_incoming_delete_ignore,
svn_client_conflict_option_incoming_delete_accept,
-1 /* end of list */
};
@@ -2639,6 +2640,7 @@ test_merge_incoming_delete_vs_local_dele
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_incoming_delete_ignore,
svn_client_conflict_option_incoming_delete_accept,
-1 /* end of list */
};
