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

Re: svn commit: r1591301 -/subversion/trunk/subversion/libsvn_client/mergeinfo.c

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 1 May 2014 14:08:37 +0100 (BST)

Bert Huijben wrote:
> Are you sure that it doesn't return the mergeinfo as it applies to the
> target, even if it has found that information by looking at the parent?
> (That is what I tried to say)

Hi, Bert. Note the comment on the code I changed:

  /* Get the TARGET_WCPATH's explicit mergeinfo. */

That comment describes exactly what the code was doing (in a long-winded way), and what it still is doing now (more succinctly). I think the reason why it was originally written in that long-winded way is
because the 'get explicit only' option to that API was not available
when that code was first written.
Before my change:

    svn_client__get_wc_mergeinfo(&target_mergeinfo, &inherited,

gets the mergeinfo as it applies to the target path, even if it has found that information by looking at the parent, as you say. But if it finds that information from a parent, it sets the 'inherited' output flag to true. And then the code said, if we got that info by inheriting it, then just return.

Now, instead of allowing this function call to get inherited mergeinfo which we don't want, we just ask it not to get inherited mergeinfo. The end result is identical.

- Julian
Received on 2014-05-01 15:12:34 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.