Return-Path: X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9ED051047C for ; Thu, 1 May 2014 16:50:01 +0000 (UTC) Received: (qmail 68910 invoked by uid 500); 1 May 2014 16:50:00 -0000 Delivered-To: apmail-subversion-dev-archive@subversion.apache.org Received: (qmail 68835 invoked by uid 500); 1 May 2014 16:50:00 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 68826 invoked by uid 99); 1 May 2014 16:50:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 16:50:00 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of bert@qqmail.nl designates 74.125.83.50 as permitted sender) Received: from [74.125.83.50] (HELO mail-ee0-f50.google.com) (74.125.83.50) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 16:49:56 +0000 Received: by mail-ee0-f50.google.com with SMTP id c13so2384605eek.23 for ; Thu, 01 May 2014 09:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qqmail.nl; s=google; h=message-id:mime-version:to:cc:from:subject:date:in-reply-to :references:content-type; bh=E5f6vXrk82vueZ8lc9F6O9L0u+EIRlBUVFFN5TJ5WVA=; b=NqSDffnkng0HKtSOFLLsJAWRLccrcOW8UblrKOEKbrQ1f42nL6x3N9nf6tgHIW47uk AUvd3LZ49LODg/4sp9vUUcJtab529VMKjHYIGElLGhYPbymv7QXt6NqepsUXlQo/Cs3a KqH3KJYKLk4hOROnnyhhCgWY05pWLiKbG6Cyw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:mime-version:to:cc:from:subject:date :in-reply-to:references:content-type; bh=E5f6vXrk82vueZ8lc9F6O9L0u+EIRlBUVFFN5TJ5WVA=; b=JvDFdhOGs5bcJc4/94J8RIdtRtuLe2ruekM3p/+D1eRTCvQs8ZoYUMMQgqESQnPG5N qAsUqs4eYZP5slOVjwx/3XnALw3Di9Sy0Qf70f7Q5Muwf9RySQeIt7uDZpykGRTyz4xl 8dDKO/IGMephpt4VEx008vGUQWLS4ubC0THJfb7nQONZosHp+52fyFkTY3b3DRaIQrR/ 6SiBwNmw8Db+zm4Cts4RDXPEmzpxvsarsyVRJSx0QyllRPPEV6KXKF7LcCTSPhsZ2wWu COzdC9oqsj5rXQPkLC05BECo36m6zcE9JPU+2kXTZjlmOktQZwxqK3AQxDKnnfHRdggg 58Yw== X-Gm-Message-State: ALoCoQmWLztqABAEzFfycW6yDRGecP6plnvvcZlQgYiegltl4quSuRtwnJG7K//yAR5ldc2WcQGX X-Received: by 10.14.203.5 with SMTP id e5mr10461736eeo.105.1398962972739; Thu, 01 May 2014 09:49:32 -0700 (PDT) Received: from [10.10.68.127] (095-097-190-172.static.chello.nl. [95.97.190.172]) by mx.google.com with ESMTPSA id h47sm77586642eey.13.2014.05.01.09.49.30 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Thu, 01 May 2014 09:49:31 -0700 (PDT) Message-ID: <53627b1b.c7490f0a.410e.76ad@mx.google.com> MIME-Version: 1.0 To: Julian Foad Cc: "dev@subversion.apache.org" From: Bert Huijben Subject: RE: svn commit: r1591301-/subversion/trunk/subversion/libsvn_client/mergeinfo.c Date: Thu, 1 May 2014 18:49:01 +0200 In-Reply-To: <1398949717.22387.YahooMailNeo@web87702.mail.ir2.yahoo.com> References: <20140430141208.841D9238890D@eris.apache.org> <5361402a.01ae0e0a.62b1.2c35@mx.google.com>,<1398942720.43605.YahooMailNeo@web87703.mail.ir2.yahoo.com> <536241b0.451f0f0a.1246.3549@mx.google.com> <1398949717.22387.YahooMailNeo@web87702.mail.ir2.yahoo.com> Content-Type: multipart/alternative; boundary="_39B150CB-4CE5-48E4-9949-8EDECB8AA5B1_" X-Virus-Checked: Checked by ClamAV on apache.org --_39B150CB-4CE5-48E4-9949-8EDECB8AA5B1_ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Thanks for the detailed response, Bert -----Original Message----- From: "Julian Foad" Sent: =E2=80=8E1-=E2=80=8E5-=E2=80=8E2014 15:12 To: "Bert Huijben" Cc: "dev@subversion.apache.org" Subject: Re: svn commit: r1591301-/subversion/trunk/subversion/libsvn_clien= t/mergeinfo.c Bert Huijben wrote:=0A= > Are you sure that it doesn't return the mergeinfo as it applies to the=0A= > target, even if it has found that information by looking at the parent?= =0A= > (That is what I tried to say)=0A= =0A= Hi, Bert. Note the comment on the code I changed:=0A= =0A= =C2=A0 /* Get the TARGET_WCPATH's explicit mergeinfo. */=0A= =0A= That comment describes exactly what the code was doing (in a long-winded wa= y), and what it still is doing now (more succinctly). I think the reason wh= y it was originally written in that long-winded way is =0A= because the 'get explicit only' option to that API was not available =0A= when that code was first written.=0A= Before my change:=0A= =0A= =C2=A0=C2=A0=C2=A0 svn_client__get_wc_mergeinfo(&target_mergeinfo, &inherit= ed,=0A= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 svn_mergeinfo_inherited,=0A= =0A= gets the mergeinfo as it applies to the target path, even if it has found t= hat 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= .=0A= =0A= Now, instead of allowing this function call to get inherited mergeinfo whic= h we don't want, we just ask it not to get inherited mergeinfo. The end res= ult is identical.=0A= =0A= - Julian --_39B150CB-4CE5-48E4-9949-8EDECB8AA5B1_ Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="utf-8"

Thanks for the detailed response,

Bert

From: Julian Foad
Sent: =E2=80=8E1-=E2=80=8E5-=E2=80= =8E2014 15:12
To: Bert = Huijben
Cc: dev@subversion.apache.org
Subject: Re: svn commit= : r1591301-/subversion/trunk/subversion/libsvn_client/mergeinfo.c

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

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

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

That comment descri= bes exactly what the code was doing (in a long-winded way), and what it sti= ll 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' opt= ion to that API was not available
when that code was first written.
= Before my change:

svn_client__get_wc_mergeinfo(&a= mp;target_mergeinfo, &inherited,
= ; &n= bsp; = ; svn_mergeinfo_inherited,

gets the mergeinfo as it applies to= the target path, even if it has found that information by looking at the p= arent, 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 t= his function call to get inherited mergeinfo which we don't want, we just a= sk it not to get inherited mergeinfo. The end result is identical.

-= Julian
= --_39B150CB-4CE5-48E4-9949-8EDECB8AA5B1_--