Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A4DB0E46C for ; Tue, 12 Mar 2013 21:15:07 +0000 (UTC) Received: (qmail 59680 invoked by uid 500); 12 Mar 2013 21:15:07 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 59556 invoked by uid 500); 12 Mar 2013 21:15:07 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 59535 invoked by uid 99); 12 Mar 2013 21:15:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Mar 2013 21:15:07 +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 markphip@gmail.com designates 209.85.214.172 as permitted sender) Received: from [209.85.214.172] (HELO mail-ob0-f172.google.com) (209.85.214.172) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Mar 2013 21:15:00 +0000 Received: by mail-ob0-f172.google.com with SMTP id tb18so338343obb.3 for ; Tue, 12 Mar 2013 14:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=FTHtpSG5Akz0USvNnfoR8mSJlZAXn9CYDPnXios4JAA=; b=LHLWd5ugpYpDJLYWnyls6ZAmZeioqa0Bim8yI4fETZLEirpKFWdgGfleT4yMVcPmmo nTZTvlBX5xCsiE5/zaU/bzZdRxUy/ohEfdiqDKmVemSJyuJILG6yniA/QXfmyRrj8nrX lGFdgnyhDIf7/FL3ZbZ//m5Ym6/nYCsV9vxdpAWR8lFFQwrgCG/KcSf2dgWEM5ACdjex B20F/jThEFLtTjtWKFmq7PRqfcqlIO8yoBcNYVLRMhcH77ue/Phn42KfbCJKkhXwOMn/ g8i0B9wIiwV/1K9OdvTVNOKakPQKmcKrr331T2HtTaJXMnKmNo1X0gFLjJqHpwd7dlPt cjKA== MIME-Version: 1.0 X-Received: by 10.182.192.3 with SMTP id hc3mr13339507obc.41.1363122879841; Tue, 12 Mar 2013 14:14:39 -0700 (PDT) Received: by 10.76.100.66 with HTTP; Tue, 12 Mar 2013 14:14:39 -0700 (PDT) In-Reply-To: <061101ce1f64$e3a22c90$aae685b0$@qqmail.nl> References: <20130312174352.95C6323888EA@eris.apache.org> <061101ce1f64$e3a22c90$aae685b0$@qqmail.nl> Date: Tue, 12 Mar 2013 17:14:39 -0400 Message-ID: Subject: Re: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp From: Mark Phippard To: dev@subversion.apache.org Cc: commits@subversion.apache.org Content-Type: multipart/alternative; boundary=f46d041fa0c509d0dc04d7c0c792 X-Virus-Checked: Checked by ClamAV on apache.org --f46d041fa0c509d0dc04d7c0c792 Content-Type: text/plain; charset=ISO-8859-1 On Tue, Mar 12, 2013 at 5:02 PM, Bert Huijben wrote: > > > > -----Original Message----- > > From: brane@apache.org [mailto:brane@apache.org] > > Sent: dinsdag 12 maart 2013 18:44 > > To: commits@subversion.apache.org > > Subject: svn commit: r1455645 - > > /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp > > > > Author: brane > > Date: Tue Mar 12 17:43:52 2013 > > New Revision: 1455645 > > > > URL: http://svn.apache.org/r1455645 > > Log: > > Working on isue #4326 (update javahl with new 1.8 APIs). > > > > * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::commit): > > Call svn_client_commit6 (with externals drilldown enabled) instead > > of svn_client_commit5. > > > > Modified: > > subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp > > > > Modified: > > subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp > > URL: > > http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl > > /native/SVNClient.cpp?rev=1455645&r1=1455644&r2=1455645&view=diff > > ========================================================== > > ==================== > > --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp > > (original) > > +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue > > Mar 12 17:43:52 2013 > > @@ -425,8 +425,9 @@ void SVNClient::commit(Targets &targets, > > if (ctx == NULL) > > return; > > > > - SVN_JNI_ERR(svn_client_commit5(targets2, depth, > > - noUnlock, keepChangelist, TRUE, > > + SVN_JNI_ERR(svn_client_commit6(targets2, depth, > > + noUnlock, keepChangelist, > > + TRUE, TRUE, TRUE, > > This will probably break Subclipse. > > The default should be to not go into externals. > > Clients like subclipse pass a list of targets and depth empty, while this > will just commit every external when committing the root of the wc with > depth empty. > > I believe we expect to pass all the targets we want committed. So I guess the main issue would be if someone were trying to commit prop changes on the root of a project and they did not select any children that were changed. We would pass the project root and not expect SVN to traverse into anything else. When we commit externals in the same commit, we pass them all as targets. We have been doing this since 1.0. We have code to break a commit into multiple API calls if the externals are for a different repository. -- Thanks Mark Phippard http://markphip.blogspot.com/ --f46d041fa0c509d0dc04d7c0c792 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Tue, Mar 12, 2013 at 5:02 PM, Bert Huijben <bert@qqmail.nl> = wrote:


> -----Original Message-----
> From: brane@apache.org [mailto= :brane@apache.org]
> Sent: dinsdag 12 maart 2013 18:44
> To: commits@subversio= n.apache.org
> Subject: svn commit: r1455645 -
> /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
>
> Author: brane
> Date: Tue Mar 12 17:43:52 2013
> New Revision: 1455645
>
> URL: http= ://svn.apache.org/r1455645
> Log:
> Working on isue #4326 (update javahl with new 1.8 APIs).
>
> * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::commit):=
> =A0 =A0Call svn_client_commit6 (with externals drilldown enabled) inst= ead
> =A0 =A0of svn_client_commit5.
>
> Modified:
> =A0 =A0 subversion/trunk/subversion/bindings/javahl/native/SVNClient.c= pp
>
> Modified:
> subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
> URL:
> http://svn.apache.org/viewvc/subversion/tr= unk/subversion/bindings/javahl
> /native/SVNClient.cpp?rev=3D1455645&r1=3D1455644&r2=3D1455645&= amp;view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp > (original)
> +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp T= ue
> Mar 12 17:43:52 2013
> @@ -425,8 +425,9 @@ void SVNClient::commit(Targets &targets,
> =A0 =A0 =A0if (ctx =3D=3D NULL)
> =A0 =A0 =A0 =A0 =A0return;
>
> - =A0 =A0SVN_JNI_ERR(svn_client_commit5(targets2, depth,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = noUnlock, keepChangelist, TRUE,
> + =A0 =A0SVN_JNI_ERR(svn_client_commit6(targets2, depth,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = noUnlock, keepChangelist,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = TRUE, TRUE, TRUE,

This will probably break Subclipse.

The default should be to not go into externals.

Clients like subclipse pass a list of targets and depth empty, while this w= ill just commit every external when committing the root of the wc with dept= h empty.


I believe we expect to pas= s all the targets we want committed. =A0So I guess the main issue would be = if someone were trying to commit prop changes on the root of a project and = they did not select any children that were changed. =A0We would pass the pr= oject root and not expect SVN to traverse into anything else.

When we commit externals in the same commit, we pass th= em all as targets. =A0We have been doing this since 1.0. We have code to br= eak a commit into multiple API calls if the externals are for a different r= epository.


--
Thanks

Mark Phippard
http://markphip.blogspot.com/ --f46d041fa0c509d0dc04d7c0c792--