You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/06/21 09:53:25 UTC
svn commit: r1749481 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Tue Jun 21 09:53:25 2016
New Revision: 1749481
URL: http://svn.apache.org/viewvc?rev=1749481&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(test_funcs): Ensure the merge/update/switch operation is always mentioned
in test descriptions.
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=1749481&r1=1749480&r2=1749481&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Tue Jun 21 09:53:25 2016
@@ -1930,41 +1930,41 @@ static struct svn_test_descriptor_t test
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(test_merge_incoming_added_file_ignore,
- "test merge incoming add file ignore"),
+ "merge incoming add file ignore"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_file_text_merge,
- "test incoming add file text merge"),
+ "merge incoming add file text merge"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_file_replace,
- "test incoming add file replace"),
+ "merge incoming add file replace"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_file_replace_and_merge,
- "test incoming add file replace and merge"),
+ "merge incoming add file replace and merge"),
SVN_TEST_OPTS_PASS(test_update_incoming_added_file_ignore,
- "test update incoming add file ignore"),
+ "update incoming add file ignore"),
SVN_TEST_OPTS_PASS(test_switch_incoming_added_file_ignore,
- "test switch incoming add file ignore"),
+ "switch incoming add file ignore"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_dir_ignore,
- "test incoming add dir ignore"),
+ "merge incoming add dir ignore"),
SVN_TEST_OPTS_XFAIL(test_merge_incoming_added_dir_merge,
- "test incoming add dir merge"),
+ "merge incoming add dir merge"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_dir_merge2,
- "test incoming add dir merge with file change"),
+ "merge incoming add dir merge with file change"),
SVN_TEST_OPTS_XFAIL(test_merge_incoming_added_dir_merge3,
- "test incoming add dir merge with move history"),
+ "merge incoming add dir merge with move history"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_dir_replace,
- "test incoming add dir replace"),
+ "merge incoming add dir replace"),
SVN_TEST_OPTS_XFAIL(test_merge_incoming_added_dir_replace_and_merge,
- "test incoming add dir replace and merge"),
+ "merge incoming add dir replace and merge"),
SVN_TEST_OPTS_PASS(test_merge_incoming_added_dir_replace_and_merge2,
- "test incoming add dir replace + merge file change"),
+ "merge incoming add dir replace with file change"),
SVN_TEST_OPTS_PASS(test_merge_incoming_delete_ignore,
- "test merge incoming delete ignore"),
+ "merge incoming delete ignore"),
SVN_TEST_OPTS_PASS(test_merge_incoming_delete_accept,
- "test merge incoming delete accept"),
+ "merge incoming delete accept"),
SVN_TEST_OPTS_PASS(test_merge_incoming_move_file_text_merge,
- "test merge incoming move file text merge"),
+ "merge incoming move file text merge"),
SVN_TEST_OPTS_PASS(test_update_incoming_move_file_text_merge,
- "test update incoming move file text merge"),
+ "update incoming move file text merge"),
SVN_TEST_OPTS_PASS(test_switch_incoming_move_file_text_merge,
- "test switch incoming move file text merge"),
+ "switch incoming move file text merge"),
SVN_TEST_NULL
};