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

Re: svn commit: r21563 - branches/merge-tracking/subversion/libsvn_client

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-09-21 16:00:41 CEST

dlr@tigris.org wrote:
> Author: dlr
> Date: Tue Sep 19 17:45:04 2006
> New Revision: 21563
> Log:
> On the merge-tracking branch: A follow-up to xxx, with slightly
> improved handling for skip notifications encountered while performing
> a merge.
> * subversion/libsvn_client/diff.c
> (notification_receiver_baton_t): Change the data type of the
> nbr_notifications field from apr_int32_t to apr_uint32_t, and
> skipped_paths from apr_array_header_t to apr_hash_t.
Currently I could not see the value in changing type of 'skipped_paths'
from 'apr_array_header_t*' to 'apr_hash_t*', As we refer it almost
always sequentially.
Now I think we should keep track of 'merged_paths' and 'nbr_skipped'
rather than 'skipped_paths'.
if (nbr_skipped)
  loop through merged_paths to set the mergeinfo optimally.
  set the mergeinfo on root of target wc

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 21 16:00:28 2006

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.