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

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.

Cheers,
-g
Received on 2012-04-27 21:53:43 CEST