subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1749458 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Tue, 21 Jun 2016 07:35:46 GMT
Author: stsp
Date: Tue Jun 21 07:35:46 2016
New Revision: 1749458

URL: http://svn.apache.org/viewvc?rev=1749458&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
  (test_option_merge_incoming_added_dir_replace_and_merge2): Tweak test docco.

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=1749458&r1=1749457&r2=1749458&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Tue Jun 21 07:35:46 2016
@@ -1709,7 +1709,7 @@ static struct svn_test_descriptor_t test
     SVN_TEST_OPTS_XFAIL(test_option_merge_incoming_added_dir_replace_and_merge,
                        "test incoming add dir replace and merge"),
     SVN_TEST_OPTS_PASS(test_option_merge_incoming_added_dir_replace_and_merge2,
-                       "test incoming add dir replace and merge"),
+                       "test incoming add dir replace + merge file change"),
     SVN_TEST_OPTS_PASS(test_option_merge_incoming_delete_ignore,
                        "test merge incoming delete ignore"),
     SVN_TEST_OPTS_PASS(test_option_merge_incoming_delete_accept,



Mime
View raw message