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

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

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 16 Apr 2015 00:14:53 +0200

On Tue, Mar 17, 2015 at 10:55:46AM -0000, rhuijben_at_apache.org wrote:
> Author: rhuijben
> Date: Tue Mar 17 10:55:45 2015
> New Revision: 1667258
>
> URL: http://svn.apache.org/r1667258
> Log:
> Avoid a db operation for each property conflict in some invocations of
> the interactive conflict resolver.

> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1667258&r1=1667257&r2=1667258&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar 17 10:55:45 2015

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.

> @@ -2815,6 +2816,7 @@ close_directory(void *dir_baton,
>
> if (conflict_skel && eb->conflict_func)
> SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, db->local_abspath,
> + svn_node_dir,
> conflict_skel,
> NULL /* merge_options */,
> eb->conflict_func,
> @@ -3000,6 +3002,7 @@ absent_node(const char *path,
> {
> if (eb->conflict_func)
> SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, local_abspath,
> + kind,
> tree_conflict,
> NULL /* merge_options */,
> eb->conflict_func,
> @@ -4539,6 +4542,7 @@ close_file(void *file_baton,
>
> if (conflict_skel && eb->conflict_func)
> SVN_ERR(svn_wc__conflict_invoke_resolver(eb->db, fb->local_abspath,
> + svn_node_file,
> conflict_skel,
> NULL /* merge_options */,
> eb->conflict_func,
>
Received on 2015-04-16 00:15:48 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.