You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/03/12 18:43:52 UTC
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,
changelists.array(subPool),
revprops.hash(subPool),
CommitCallback::callback, callback,
Re: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Posted by Branko Čibej <br...@wandisco.com>.
On 12.03.2013 22:02, 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.
That sounds just wrong. With depth=empty, I'd expect /not/ to recurse
into externals, regardless of the value of the include_externals flag.
-- Brane
--
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com
Re: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Mar 12, 2013 at 5:02 PM, Bert Huijben <be...@qqmail.nl> 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/
Re: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Mar 12, 2013 at 5:02 PM, Bert Huijben <be...@qqmail.nl> 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/
RE: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Posted by Bert Huijben <be...@qqmail.nl>.
> -----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.
Bert
RE: svn commit: r1455645 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
Posted by Bert Huijben <be...@qqmail.nl>.
> -----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.
Bert