Author: svn-role
Date: Thu May 28 04:00:12 2020
New Revision: 1878211
URL: http://svn.apache.org/viewvc?rev=1878211&view=rev
Log:
Merge r1877072 from trunk:
* r1877072
svnmucc: Change an error message to state another possible cause of the
error.
Justification:
Error messages should be accurate. User reported (issue #4854).
Votes:
+1: danielsh, stsp, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_client/mtcc.c
subversion/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1877072
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1878211&r1=1878210&r2=1878211&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu May 28 04:00:12 2020
@@ -55,14 +55,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1877072
- svnmucc: Change an error message to state another possible cause of the
- error.
- Justification:
- Error messages should be accurate. User reported (issue #4854).
- Votes:
- +1: danielsh, stsp, jcorvel
-
* r1877259
Move variable declarations to the start of block the to fix
syntax errors with VC9 (Visual Studio 2008).
Modified: subversion/branches/1.14.x/subversion/libsvn_client/mtcc.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/mtcc.c?rev=1878211&r1=1878210&r2=1878211&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_client/mtcc.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_client/mtcc.c Thu May 28
04:00:12 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/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py?rev=1878211&r1=1878210&r2=1878211&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/svnmucc_tests.py Thu
May 28 04:00:12 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')
