Re: svn commit: r1330058 - in /subversion/trunk/subversion: include/svn_error_codes.h include/svn_fs.h libsvn_fs/editor.c libsvn_repos/commit.c

Greg Stein <gstein_at_gmail.com> writes:

> The current err->message says "Conflict at '/some/path'." (no real context)
>
> mod_dav_svn returns a message such as:
>
> "A conflict occurred during the CHECKIN processing. The problem
> occurred with the \"%s\" resource."
> or
> "Conflict when committing '%s'."
> or
> "A conflict occurred during the MERGE processing. The problem occurred
> with the \"%s\" resource."
>
> To construct each of these, it needs the path. And I argue the above
> messages are more understandable.

That's what goes in the Apache error log but it's not what the client
sees. Using recent trunk for client and server:

svn mkdir -mm http://localhost:8888/obj/repo/A --config-option servers:global:http-library=serf
../src/subversion/svn/mkdir-cmd.c:100: (apr_err=160024)
../src/subversion/libsvn_client/add.c:980: (apr_err=160024)
../src/subversion/libsvn_ra_serf/commit.c:2216: (apr_err=160024)
../src/subversion/libsvn_ra_serf/util.c:734: (apr_err=160024)
../src/subversion/libsvn_ra_serf/util.c:1837: (apr_err=160024)
../src/subversion/libsvn_ra_serf/util.c:1781: (apr_err=160024)
../src/subversion/libsvn_ra_serf/util.c:880: (apr_err=160024)
svn: E160024: Conflict at '/A'

xsvn mkdir -mm http://localhost:8888/obj/repo/A --config-option servers:global:http-library=neon
../src/subversion/svn/mkdir-cmd.c:100: (apr_err=160024)
../src/subversion/libsvn_client/add.c:980: (apr_err=160024)
../src/subversion/libsvn_ra_neon/commit.c:1526: (apr_err=160024)
../src/subversion/libsvn_ra_neon/merge.c:759: (apr_err=160024)
../src/subversion/libsvn_ra_neon/util.c:1324: (apr_err=160024)
../src/subversion/libsvn_ra_neon/util.c:1565: (apr_err=160024)
../src/subversion/libsvn_ra_neon/util.c:780: (apr_err=160024)
svn: E160024: Conflict at '/A'

svn mkdir -mm svn://localhost/repo/A
../src/subversion/svn/mkdir-cmd.c:100: (apr_err=160024)
../src/subversion/libsvn_client/add.c:980: (apr_err=160024)
../src/subversion/libsvn_repos/commit.c:790: (apr_err=160024)
../src/subversion/libsvn_fs/fs-loader.c:675: (apr_err=160024)
../src/subversion/libsvn_fs_fs/tree.c:1712: (apr_err=160024)
../src/subversion/libsvn_fs_fs/tree.c:1575: (apr_err=160024)
../src/subversion/libsvn_fs_fs/tree.c:1158: (apr_err=160024)
svn: E160024: Conflict at '/A'

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com