svn-r...@apache.org wrote on Thu, 28 May 2020 04:00 -0000:
> +++ 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);

Is "was created" in the correct tense?  This error message is triggered
before the RA session is opened, so it shouldn't imply that the earlier
operation completed successfully.

> +++ 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):
>    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')

Reply via email to