Author: stsp
Date: Thu Apr 21 07:57:35 2016
New Revision: 1740247
URL: http://svn.apache.org/viewvc?rev=1740247&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(create_wc_with_add_vs_add_upon_merge_conflict): Rename to ...
(create_wc_with_file_add_vs_file_add_merge_conflict): ... this to prevent
clashes with future similar functions for cases involving directories.
(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): Update callers.
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=1740247&r1=1740246&r2=1740247&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Thu Apr 21
07:57:35 2016
@@ -68,7 +68,7 @@ static const char *propval_branch = "Thi
/* A helper function which prepares a working copy for the tests below. */
static svn_error_t *
-create_wc_with_add_vs_add_upon_merge_conflict(svn_test__sandbox_t *b)
+create_wc_with_file_add_vs_file_add_merge_conflict(svn_test__sandbox_t *b)
{
static const char *new_file_path;
svn_client_ctx_t *ctx;
@@ -173,7 +173,7 @@ test_option_merge_incoming_added_file_ig
SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_ignore",
opts, pool));
- SVN_ERR(create_wc_with_add_vs_add_upon_merge_conflict(b));
+ SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
/* Resolve the tree conflict. */
SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
@@ -246,7 +246,7 @@ test_option_merge_incoming_added_file_te
SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_text_merge",
opts, pool));
- SVN_ERR(create_wc_with_add_vs_add_upon_merge_conflict(b));
+ SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
/* Resolve the tree conflict. */
SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
@@ -320,7 +320,7 @@ test_option_merge_incoming_added_file_re
SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_replace",
opts, pool));
- SVN_ERR(create_wc_with_add_vs_add_upon_merge_conflict(b));
+ SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
/* Resolve the tree conflict. */
SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
@@ -394,7 +394,7 @@ test_option_merge_incoming_added_file_re
SVN_ERR(svn_test__sandbox_create(b, "incoming_added_file_replace_and_merge",
opts, pool));
- SVN_ERR(create_wc_with_add_vs_add_upon_merge_conflict(b));
+ SVN_ERR(create_wc_with_file_add_vs_file_add_merge_conflict(b));
/* Resolve the tree conflict. */
SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
