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

gstein_at_apache.org writes:

> + else
> + {
> + SVN_ERR_ASSERT(err != NULL);
> + if (err->apr_err == SVN_ERR_FS_CONFLICT)
> + {
> + /* Case 2. */
> +
> + /* Copy this into the correct pool (see note above). */
> + *conflict_path = apr_pstrdup(result_pool, inner_conflict_path);
> +
> + /* Return sucess. The caller should inspect CONFLICT_PATH to
> + determine this particular case. */
> + svn_error_clear(err);
> + err = SVN_NO_ERROR;
> + }

By clearing err we limit the information about the conflict to just the
conflict path--if there is a more detailed explanation in err it is
discarded. Is that what we want? The FS layers detect all sorts of
conflicts that could be described in err, although they don't do so at
present.

I suppose that the user resolves the conflict by updating the working
copy, but that assumes that there is a working copy and that the update
will use the same revision and get the same conflict.

-- 
Philip