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 2018/09/24 05:50:57 UTC
svn commit: r1841796 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Mon Sep 24 05:50:57 2018
New Revision: 1841796
URL: http://svn.apache.org/viewvc?rev=1841796&view=rev
Log:
Fix wrong paths in comments in resolver tests.
Found by: jcorvel
* subversion/tests/libsvn_client/conflicts-test.c
(test_local_missing_abiguous_moves_dir): Fix up references to "A/mu" which
isn't used by this test; it uses "A/B" instead.
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=1841796&r1=1841795&r2=1841796&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Mon Sep 24 05:50:57 2018
@@ -5959,7 +5959,7 @@ test_local_missing_abiguous_moves_dir(co
SVN_TEST_ASSERT(option != NULL);
/*
- * Possible repository destinations for moved-away 'A/mu' are:
+ * Possible repository destinations for moved-away 'A/B' are:
* (1): '^/A/B-copied'
* (2): '^/A/B-moved'
* (3): '^/A1/B-copied-from-A'
@@ -5985,7 +5985,7 @@ test_local_missing_abiguous_moves_dir(co
APR_ARRAY_IDX(possible_moved_to_abspaths, 0, const char *),
sbox_wc_path(b, "A/B-copied"));
- /* Move target for "A/mu-moved" is not ambiguous. */
+ /* Move target for "A/B-moved" is not ambiguous. */
SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(option, 1,
ctx, b->pool));
SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates(
@@ -6000,7 +6000,7 @@ test_local_missing_abiguous_moves_dir(co
ctx, b->pool));
/*
- * Possible working copy destinations for moved-away 'A/mu' are:
+ * Possible working copy destinations for moved-away 'A/B-copied-from-A' are:
* (1): 'A/B-copied-from-A'
* (2): 'A1/B-copied-from-A'
*/
@@ -6024,7 +6024,7 @@ test_local_missing_abiguous_moves_dir(co
svn_client_conflict_option_local_move_dir_merge, ctx,
b->pool));
- /* The node "A/mu" should no longer exist. */
+ /* The node "A/B" should no longer exist. */
SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict,
sbox_wc_path(b, "A/B"),
ctx, pool, pool),