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 07:30:05 UTC
svn commit: r1749457 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Tue Jun 21 07:30:05 2016
New Revision: 1749457
URL: http://svn.apache.org/viewvc?rev=1749457&view=rev
Log:
Add "merge_" prefix to the names of conflict resolver merge test sandboxes.
The few tests we have for update and switch already use a corresponding prefix.
* subversion/tests/libsvn_client/conflicts-test.c
(test_option_merge_incoming_added_file_ignore,
test_option_merge_incoming_added_file_text_merge,
test_option_merge_incoming_added_file_replace,
test_option_merge_incoming_added_file_replace_and_merge,
test_option_merge_incoming_added_dir_ignore,
test_option_merge_incoming_added_dir_merge,
test_option_merge_incoming_added_dir_merge2,
test_option_merge_incoming_added_dir_merge3,
test_option_merge_incoming_added_dir_replace,
test_option_merge_incoming_added_dir_replace_and_merge,
test_option_merge_incoming_added_dir_replace_and_merge2,
test_option_merge_incoming_delete_ignore,
test_option_merge_incoming_delete_accept): Rename sandbox directories.
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=1749457&r1=1749456&r2=1749457&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:30:05 2016
@@ -175,7 +175,7 @@ test_option_merge_incoming_added_file_ig
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_ignore",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_file_ignore",
opts, pool));
SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
@@ -248,7 +248,7 @@ test_option_merge_incoming_added_file_te
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_text_merge",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_file_text_merge",
opts, pool));
SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
@@ -322,7 +322,7 @@ test_option_merge_incoming_added_file_re
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_replace",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_file_replace",
opts, pool));
SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
@@ -396,8 +396,8 @@ test_option_merge_incoming_added_file_re
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_replace_and_merge",
- opts, pool));
+ SVN_ERR(svn_test__sandbox_create(
+ b, "merge_incoming_added_file_replace_and_merge", opts, pool));
SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
@@ -609,7 +609,7 @@ test_option_merge_incoming_added_dir_ign
svn_opt_revision_t opt_rev;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_ignore",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_dir_ignore",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
@@ -680,7 +680,7 @@ test_option_merge_incoming_added_dir_mer
const svn_string_t *propval;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_merge",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_dir_merge",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
@@ -773,7 +773,7 @@ test_option_merge_incoming_added_dir_mer
const svn_string_t *propval;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_merge2",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_dir_merge2",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, TRUE, FALSE,
@@ -865,7 +865,7 @@ test_option_merge_incoming_added_dir_mer
const svn_string_t *propval;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_merge3",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_dir_merge3",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, TRUE, TRUE,
@@ -976,7 +976,7 @@ test_option_merge_incoming_added_dir_rep
svn_opt_revision_t opt_rev;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_replace",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_added_dir_replace",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
@@ -1047,7 +1047,8 @@ test_option_merge_incoming_added_dir_rep
svn_opt_revision_t opt_rev;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_replace_and_merge",
+ SVN_ERR(svn_test__sandbox_create(b,
+ "merge_incoming_added_dir_replace_and_merge",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
@@ -1132,7 +1133,8 @@ test_option_merge_incoming_added_dir_rep
svn_opt_revision_t opt_rev;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b, "incoming_added_dir_replace_and_merge",
+ SVN_ERR(svn_test__sandbox_create(b,
+ "merge_incoming_added_dir_replace_and_merge",
opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
@@ -1286,7 +1288,7 @@ test_option_merge_incoming_delete_ignore
struct svn_client_status_t *status;
svn_opt_revision_t opt_rev;
- SVN_ERR(svn_test__sandbox_create(b, "incoming_delete_ignore",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_delete_ignore",
opts, pool));
SVN_ERR(create_wc_with_incoming_delete_merge_conflict(b, FALSE, FALSE));
@@ -1352,7 +1354,7 @@ test_option_merge_incoming_delete_accept
struct svn_client_status_t *status;
svn_opt_revision_t opt_rev;
- SVN_ERR(svn_test__sandbox_create(b, "incoming_delete_accept",
+ SVN_ERR(svn_test__sandbox_create(b, "merge_incoming_delete_accept",
opts, pool));
SVN_ERR(create_wc_with_incoming_delete_merge_conflict(b, FALSE, FALSE));