You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2020/04/27 13:13:43 UTC
svn commit: r1877072 - in /subversion/trunk/subversion: libsvn_client/mtcc.c
tests/cmdline/svnmucc_tests.py
Author: danielsh
Date: Mon Apr 27 13:13:43 2020
New Revision: 1877072
URL: http://svn.apache.org/viewvc?rev=1877072&view=rev
Log:
svnmucc: Change an error message to state another possible cause of the error.
Fixes issue #4854.
* subversion/libsvn_client/mtcc.c
(mtcc_verify_create): Reword error message.
* subversion/tests/cmdline/svnmucc_tests.py
(svnmucc_type_errors, svnmucc_propset_and_put): Update expectations.
Modified:
subversion/trunk/subversion/libsvn_client/mtcc.c
subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py
Modified: subversion/trunk/subversion/libsvn_client/mtcc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mtcc.c?rev=1877072&r1=1877071&r2=1877072&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mtcc.c (original)
+++ subversion/trunk/subversion/libsvn_client/mtcc.c Mon Apr 27 13:13:43 2020
@@ -453,7 +453,8 @@ mtcc_verify_create(svn_client__mtcc_t *m
if (op)
return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
- _("Path '%s' already exists"),
+ _("Path '%s' already exists, or was created "
+ "by an earlier operation"),
new_relpath);
SVN_ERR(mtcc_op_find(&op, NULL, new_relpath, mtcc->root_op, TRUE, TRUE,
Modified: subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py?rev=1877072&r1=1877071&r2=1877072&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py Mon Apr 27 13:13:43 2020
@@ -534,7 +534,8 @@ def svnmucc_type_errors(sbox):
'put', sbox.ospath('file'), 'A')
xtest_svnmucc(sbox.repo_url,
- ["svnmucc: E160020: Path 'Z' already exists"],
+ ["svnmucc: E160020: Path 'Z' already exists, or was created "
+ "by an earlier operation"],
'-m', '',
'mkdir', 'A/Z',
'put', sbox.ospath('file'), 'A/Z')
@@ -576,7 +577,8 @@ def svnmucc_propset_and_put(sbox):
# Put same file twice (non existing)
xtest_svnmucc(sbox.repo_url,
- ["svnmucc: E160020: Path 't3' already exists"],
+ ["svnmucc: E160020: Path 't3' already exists, or was created "
+ "by an earlier operation"],
'-m', '',
'put', sbox.ospath('file'), 't3',
'put', sbox.ospath('file'), 't3')