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

Re: Reviewing r34562

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 17 Dec 2008 10:16:28 -0500

Julian Foad wrote:
> Kamesh Jayachandran wrote:
>> Thanks Julian fixed in r34760(revert of r34756) and r34762.
>
> [[[
> $ svn diff -c34762
> Index: subversion/libsvn_client/merge.c
> ===================================================================
> --- subversion/libsvn_client/merge.c (revision 34761)
> +++ subversion/libsvn_client/merge.c (revision 34762)
> @@ -6374,10 +6374,7 @@
> SVN_ERR_ASSERT(svn_path_is_child(abs_target_path,
> abs_added_path,
> iterpool));
> - common_ancestor_path =
> - svn_path_get_longest_ancestor(abs_added_path,
> - abs_target_path,
> - iterpool);
> + common_ancestor_path = abs_target_path;
> /* Need to +1 to avoid a leading '/'. */
> rel_added_path =
> abs_added_path + strlen(common_ancestor_path) + 1;
> ]]]
>
> That looks better, but isn't the next line simply setting rel_added_path
> to the result of the svn_path_is_child() call above?

Yup.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985768

Received on 2008-12-17 16:16:52 CET

This is an archived mail posted to the Subversion Dev mailing list.