Re: svn commit: r1667258 - in /subversion/trunk/subversion/libsvn_wc: conflicts.c conflicts.h merge.c props.c update_editor.c

Stefan Sperling wrote:
>> URL: http://svn.apache.org/r1667258
>> Log:
>> Avoid a db operation for each property conflict in some invocations of
>> the interactive conflict resolver.
>
> Are we sure the hard-coded node kinds (svn_node_dir, svn_node_file)
> below are always correct? These are supposed to represent the node
> kind of the tree conflict victim, which is not necessarily the same
> as the server thinks it should be.

The new 'kind' argument added to svn_wc__conflict_invoke_resolver()
need to be be documented, as it is not obvious whether it is supposed
to represent the kind of the source, the target, the YCA, or the
on-disk node-version. In fact it appears to be only used within that
function for prop conflicts, where the node kind must be the same for
all versions, but that function can also be called for tree conflicts,
and it is not clear what the caller should pass in that case.

- Julian
Received on 2015-04-16 11:17:34 CEST