[PATCH] Fix for temporarily accepting ssl certificate not working in javahl

2016-10-13 Thread Doros Agathangelou
Hi All I discovered a small bug in javahl and I believe I have a one line patch that fixes it. When connecting to a server via https and a self signed certificate is used on the server, we get a callback on UserPasswordCallback.askTrustSSLServer() method that asks the user whether to reject the c

[PATCH] Resolve issue #4647 on trunk (v3)

2016-10-13 Thread Stefan
On 10/13/2016 11:38 AM, Stefan wrote: > On 10/13/2016 11:08 AM, Stefan wrote: >> On 10/10/2016 11:39 PM, Stefan wrote: >>> On 10/10/2016 6:12 PM, Ivan Zhakov wrote: On 10 October 2016 at 17:53, Stefan wrote: > On 8/28/2016 11:32 PM, Bert Huijben wrote: >>> -Original Message- >

Re: [PATCH v3] Conflict option labels

2016-10-13 Thread Stefan
On 10/13/2016 5:26 PM, Patrick Steinhardt wrote: > sion re-adds the result pool to > `svn_client_conflict_option_get_lazel`. > diff --git a/subversion/include/svn_client.h > b/subversion/include/svn_client.h > index 9bbe62b..f456c92 100644 > --- a/subversion/include/svn_client.h > +++ b/subversion

[PATCH v3] Conflict option labels

2016-10-13 Thread Patrick Steinhardt
Hi, the third version re-adds the result pool to `svn_client_conflict_option_get_lazel`. [[ Move conflict resolution options' labels out of the client * subversion/include/svn_client.h: (svn_client_conflict_option_get_label): New function. * subversion/libsvn_client/conflicts.c: (svn_client_

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 15:46, Patrick Steinhardt wrote: > Hi, > > here's the second version of the conflict option label patch. > Changes: > > - reworded some labels > - now using apr_array to pass around options > - renamed and simplified svn_client_resolver_option_label > > The functionality has

Re: Backport mixup last night

2016-10-13 Thread Johan Corveleyn
On Thu, Oct 13, 2016 at 4:17 PM, Daniel Shahaf wrote: > Johan Corveleyn wrote on Thu, Oct 13, 2016 at 11:37:25 +0200: >> [...] the cronjob of backport.pl was running simultaneously on >> svn-qavm2 (old machine) and svn-qavm3 (new machine we're migrating to, >> see [1]), creating a race. >> >> For

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Patrick Steinhardt
On Thu, Oct 13, 2016 at 04:52:12PM +0200, Stefan Sperling wrote: > On Thu, Oct 13, 2016 at 04:46:55PM +0200, Patrick Steinhardt wrote: > > Is there by any chance a tool which helps generating this tedious > > list? > > There are some but I cannot tell which is best and how well these are working.

Re: Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

2016-10-13 Thread Daniel Shahaf
Johan Corveleyn wrote on Thu, Oct 13, 2016 at 13:14:30 +0200: > On Thu, Oct 13, 2016 at 1:05 PM, Branko Čibej wrote: > > On 13.10.2016 13:01, Branko Čibej wrote: > >> On 13.10.2016 11:39, Ivan Zhakov wrote: > >>> On 13 October 2016 at 10:59, wrote: > Author: jcorvel > Date: Thu Oct 13

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Stefan Sperling
On Thu, Oct 13, 2016 at 04:46:55PM +0200, Patrick Steinhardt wrote: > Is there by any chance a tool which helps generating this tedious > list? There are some but I cannot tell which is best and how well these are working. https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/vim/

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Patrick Steinhardt
On Thu, Oct 13, 2016 at 04:40:59PM +0200, Stefan Sperling wrote: > On Thu, Oct 13, 2016 at 03:46:32PM +0200, Patrick Steinhardt wrote: > > * subversion/include/svn_client.h: > > - new function `svn_client_conflict_option_get_label` > > * subversion/libsvn_client/conflicts.c: > > - svn_client_co

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Stefan Sperling
On Thu, Oct 13, 2016 at 03:46:32PM +0200, Patrick Steinhardt wrote: > * subversion/include/svn_client.h: > - new function `svn_client_conflict_option_get_label` > * subversion/libsvn_client/conflicts.c: > - svn_client_conflict_option_t: add label > - add_resolution_option: add label argument

Re: svn commit: r1764676 - /subversion/trunk/subversion/libsvn_fs_fs/pack.c

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 15:49, wrote: > Author: stefan2 > Date: Thu Oct 13 13:49:47 2016 > New Revision: 1764676 > > URL: http://svn.apache.org/viewvc?rev=1764676&view=rev > Log: > Make the FSFS pack no longer depend on a working file trunc() operation. > > * subversion/libsvn_fs_fs/pack.c > (res

Re: Backport mixup last night

2016-10-13 Thread Daniel Shahaf
Johan Corveleyn wrote on Thu, Oct 13, 2016 at 11:37:25 +0200: > [...] the cronjob of backport.pl was running simultaneously on > svn-qavm2 (old machine) and svn-qavm3 (new machine we're migrating to, > see [1]), creating a race. > > For now, I've just renamed the backport.pl script on qavm2, so it

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 15:52, Patrick Steinhardt wrote: > On Thu, Oct 13, 2016 at 03:46:32PM +0200, Patrick Steinhardt wrote: >> Hi, >> [..] > [snip] > > By the way, one problem that still exists is consistency. Right > now, we have a mixture of labels where the first character is > uppercased and

Re: [PATCH v2] Conflict option labels

2016-10-13 Thread Patrick Steinhardt
On Thu, Oct 13, 2016 at 03:46:32PM +0200, Patrick Steinhardt wrote: > Hi, > > here's the second version of the conflict option label patch. > Changes: > > - reworded some labels > - now using apr_array to pass around options > - renamed and simplified svn_client_resolver_option_label > > The fun

[PATCH v2] Conflict option labels

2016-10-13 Thread Patrick Steinhardt
Hi, here's the second version of the conflict option label patch. Changes: - reworded some labels - now using apr_array to pass around options - renamed and simplified svn_client_resolver_option_label The functionality has been lightly tested by creating conflict scenarios. [[ Move conflict res

Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 15:23, Stefan Sperling wrote: > On Thu, Oct 13, 2016 at 03:01:39PM +0200, Ivan Zhakov wrote: >> I suggest to change behavior to something like the following: >> [[[ >> $ svn resolve >> Searching tree conflict details for >> 'D:\ivan\svn\test-wc\add-versus-add\foo' in reposito

Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Branko Čibej
On 13.10.2016 14:56, Ivan Zhakov wrote: > On 13 October 2016 at 14:00, Branko Čibej wrote: >> On 13.10.2016 13:28, Johan Corveleyn wrote: >>> On Thu, Oct 13, 2016 at 1:22 PM, Ivan Zhakov wrote: On 12 October 2016 at 22:30, Johan Corveleyn wrote: > On Wed, Oct 12, 2016 at 10:13 PM, wrot

Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Evgeny Kotkov
Ivan Zhakov writes: > I suggest to change behavior to something like the following: > [[[ > $ svn resolve > Searching tree conflict details for > 'D:\ivan\svn\test-wc\add-versus-add\foo' in repository: > Checking r5... done > Tree conflict on 'D:\ivan\svn\test-wc\add-versus-add\foo': > File merge

Re: [RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Stefan Sperling
On Thu, Oct 13, 2016 at 03:01:39PM +0200, Ivan Zhakov wrote: > I suggest to change behavior to something like the following: > [[[ > $ svn resolve > Searching tree conflict details for > 'D:\ivan\svn\test-wc\add-versus-add\foo' in repository: > Checking r5... done > Tree conflict on 'D:\ivan\svn\te

[RFC] Subversion command line UI for interactive conflict resolution

2016-10-13 Thread Ivan Zhakov
Hi, I'm thinking new conflict resolution should look like in Subversion command line client. Currently 'svn resolve' works like the following: [[[ $ svn resolve Searching tree conflict details for 'D:\ivan\svn\test-wc\add-versus-add\foo' in repository: Checking r5... done Tree conflict on 'D:\ivan

Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 14:00, Branko Čibej wrote: > On 13.10.2016 13:28, Johan Corveleyn wrote: >> On Thu, Oct 13, 2016 at 1:22 PM, Ivan Zhakov wrote: >>> On 12 October 2016 at 22:30, Johan Corveleyn wrote: On Wed, Oct 12, 2016 at 10:13 PM, wrote: > Author: ivan > Date: Wed Oct 12 2

Re: [PATCH] Reject checkouts to existing directory

2016-10-13 Thread Stefan
On 10/12/2016 5:00 PM, 'Stefan Sperling' wrote: > I'm actually surprised that we made this change in 1.7. > > If 'svn checkout' sees an existing directory the most likely situation is > that the user has made a mistake. Leaving behind a working copy full of > tree conflicts is hardly useful in this

RE: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Bert Huijben
> -Original Message- > From: Branko Čibej [mailto:br...@apache.org] > Sent: donderdag 13 oktober 2016 14:00 > To: dev@subversion.apache.org > Subject: Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS > There's no chance of doing this in a reasonable time-frame because we > r

Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Branko Čibej
On 13.10.2016 13:28, Johan Corveleyn wrote: > On Thu, Oct 13, 2016 at 1:22 PM, Ivan Zhakov wrote: >> On 12 October 2016 at 22:30, Johan Corveleyn wrote: >>> On Wed, Oct 12, 2016 at 10:13 PM, wrote: Author: ivan Date: Wed Oct 12 20:13:24 2016 New Revision: 1764536 URL: ht

Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Johan Corveleyn
On Thu, Oct 13, 2016 at 1:22 PM, Ivan Zhakov wrote: > On 12 October 2016 at 22:30, Johan Corveleyn wrote: >> On Wed, Oct 12, 2016 at 10:13 PM, wrote: >>> >>> Author: ivan >>> Date: Wed Oct 12 20:13:24 2016 >>> New Revision: 1764536 >>> >>> URL: http://svn.apache.org/viewvc?rev=1764536&view=rev >

Re: svn commit: r1764536 - /subversion/branches/1.9.x/STATUS

2016-10-13 Thread Ivan Zhakov
On 12 October 2016 at 22:30, Johan Corveleyn wrote: > On Wed, Oct 12, 2016 at 10:13 PM, wrote: >> >> Author: ivan >> Date: Wed Oct 12 20:13:24 2016 >> New Revision: 1764536 >> >> URL: http://svn.apache.org/viewvc?rev=1764536&view=rev >> Log: >> * STATUS: Veto r1759116 group. >> >> Modified: >>

[PATCH] Improve error message on copying to unversioned dir

2016-10-13 Thread Patrick Steinhardt
Hi, attached a patch to a wrong and confusing error message. [[ libsvn_client: improve error when copying to unversioned dir When trying to copy a file to an unversioned (but existing) directory '/foo/bar', subversion will happily claim that "Path '/foo/bar' is not a directory", which is obvious

Re: Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

2016-10-13 Thread Johan Corveleyn
On Thu, Oct 13, 2016 at 1:05 PM, Branko Čibej wrote: > On 13.10.2016 13:01, Branko Čibej wrote: >> On 13.10.2016 11:39, Ivan Zhakov wrote: >>> On 13 October 2016 at 10:59, wrote: Author: jcorvel Date: Thu Oct 13 08:59:07 2016 New Revision: 1764631 URL: http://svn.apache.

Re: Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

2016-10-13 Thread Branko Čibej
On 13.10.2016 13:01, Branko Čibej wrote: > On 13.10.2016 11:39, Ivan Zhakov wrote: >> On 13 October 2016 at 10:59, wrote: >>> Author: jcorvel >>> Date: Thu Oct 13 08:59:07 2016 >>> New Revision: 1764631 >>> >>> URL: http://svn.apache.org/viewvc?rev=1764631&view=rev >>> Log: >>> Resurrect the '1.9

Re: Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

2016-10-13 Thread Branko Čibej
On 13.10.2016 11:39, Ivan Zhakov wrote: > On 13 October 2016 at 10:59, wrote: >> Author: jcorvel >> Date: Thu Oct 13 08:59:07 2016 >> New Revision: 1764631 >> >> URL: http://svn.apache.org/viewvc?rev=1764631&view=rev >> Log: >> Resurrect the '1.9.x-r1721488' branch, to give backport.pl another >>

Re: Status review for 1.8.17 and 1.9.5

2016-10-13 Thread Stefan Fuhrmann
On 12.10.2016 22:22, Evgeny Kotkov wrote: Stefan Fuhrmann writes: There are a number of backport proposals that only need one more +1. Since the Berlin hackathon is going on and we feel like preparing the next patch release(s) soon-ish, please review and vote. I plan to roll 1.9.5 after the h

Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

2016-10-13 Thread Ivan Zhakov
On 13 October 2016 at 10:59, wrote: > Author: jcorvel > Date: Thu Oct 13 08:59:07 2016 > New Revision: 1764631 > > URL: http://svn.apache.org/viewvc?rev=1764631&view=rev > Log: > Resurrect the '1.9.x-r1721488' branch, to give backport.pl another > chance to execute the correct backport commands,

Re: [PATCH] Resolve issue #4647 on trunk (v2)

2016-10-13 Thread Stefan
On 10/13/2016 11:08 AM, Stefan wrote: > On 10/10/2016 11:39 PM, Stefan wrote: >> On 10/10/2016 6:12 PM, Ivan Zhakov wrote: >>> On 10 October 2016 at 17:53, Stefan wrote: On 8/28/2016 11:32 PM, Bert Huijben wrote: >> -Original Message- >> From: Daniel Shahaf [mailto:d...@daniel

Backport mixup last night

2016-10-13 Thread Johan Corveleyn
Just a quick report about what happened and what I've done (things are okay now). There was an svn-role (automatic backport) mixup last night: some revisions were still correct, but the last 6 automated backport commits were wrong (mixed STATUS changes with wrong actual changes etc). Cause: the cr

[PATCH] Resolve issue #4647 on trunk (v2)

2016-10-13 Thread Stefan
On 10/10/2016 11:39 PM, Stefan wrote: > On 10/10/2016 6:12 PM, Ivan Zhakov wrote: >> On 10 October 2016 at 17:53, Stefan wrote: >>> On 8/28/2016 11:32 PM, Bert Huijben wrote: > -Original Message- > From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > Sent: zondag 28 augustus