[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Sat, 28 Apr 2012 11:56:20 +0300

Greg Stein wrote on Fri, Apr 27, 2012 at 15:53:12 -0400:
> On Fri, Apr 27, 2012 at 15:25, Philip Martin <philip.martin_at_wandisco.com> wrote:
> > 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:
>
> Yeah. I was trying to track down some error message propagation for
> lock_tests 1. Something is jammed up, and I don't know why the human
> readable errors aren't marshalled like in other situations. Separate
> bug.

IIRC mod_dav_svn marshals just the top error in the chain, not the whole
chain. (grepping for svn_error_purge_tracing() should find that code)
Received on 2012-04-28 10:56:58 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.