Re: 'svn list --search' feature complete? (was: re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-08-21 Thread Julian Foad
Johan Corveleyn wrote: > On Sun, Jan 29, 2017 at 10:35 AM, Stefan Fuhrmann wrote: >> Originally, I wanted to complete the get_list API before the alpha >> release but I can't make any commitments. So, it is probably better >> to roll the alpha with whatever is on /trunk at that time. > > Is the

'svn list --search' feature complete? (was: re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-08-18 Thread Johan Corveleyn
On Sun, Jan 29, 2017 at 10:35 AM, Stefan Fuhrmann wrote: > On 24.01.2017 12:20, Stefan Sperling wrote: ... >> I would like to get an 1.10.0 alpha1 released in February. Unless I hear >> objections I will start rolling this alpha release from trunk and call a >> vote on it soon. > > > Originally, I

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-29 Thread Stefan Fuhrmann
On 24.01.2017 12:20, Stefan Sperling wrote: Hi, Another update on the new conflict resolver: We have 36 conflict resolver tests, all of which PASS. I have updated the wiki page about conflict tests accordingly: https://wiki.apache.org/subversion/TreeConflictTests The 36 tests we have still do

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-25 Thread Daniel Shahaf
Stefan Sperling wrote on Wed, Jan 25, 2017 at 11:37:30 +0100: > On Tue, Jan 24, 2017 at 07:06:29PM +, Daniel Shahaf wrote: > > Stefan Sperling wrote on Tue, Jan 24, 2017 at 19:06:13 +0100: > > That's just a synchronization problem and is easily solved. I'm more > > concerned that we'd need to

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-25 Thread Stefan Hett
On 1/25/2017 11:37 AM, Stefan Sperling wrote: On Tue, Jan 24, 2017 at 07:06:29PM +, Daniel Shahaf wrote: Stefan Sperling wrote on Tue, Jan 24, 2017 at 19:06:13 +0100: On Tue, Jan 24, 2017 at 05:52:39PM +, Daniel Shahaf wrote: [...] If we do this, it would be good to know upfront what

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-25 Thread Stefan Sperling
On Tue, Jan 24, 2017 at 07:06:29PM +, Daniel Shahaf wrote: > Stefan Sperling wrote on Tue, Jan 24, 2017 at 19:06:13 +0100: > > On Tue, Jan 24, 2017 at 05:52:39PM +, Daniel Shahaf wrote: > > > I wonder if we should delay the release announcement until we can link > > > to a bunch of .deb/.rp

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-25 Thread Stefan Sperling
On Tue, Jan 24, 2017 at 11:41:47PM +0100, Johan Corveleyn wrote: > On Tue, Jan 24, 2017 at 12:20 PM, Stefan Sperling wrote: > > Hi, > > > > Another update on the new conflict resolver: > > > > We have 36 conflict resolver tests, all of which PASS. > > I have updated the wiki page about conflict te

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Johan Corveleyn
On Tue, Jan 24, 2017 at 12:20 PM, Stefan Sperling wrote: > Hi, > > Another update on the new conflict resolver: > > We have 36 conflict resolver tests, all of which PASS. > I have updated the wiki page about conflict tests accordingly: > https://wiki.apache.org/subversion/TreeConflictTests > > The

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Daniel Shahaf
Stefan Sperling wrote on Tue, Jan 24, 2017 at 19:06:13 +0100: > On Tue, Jan 24, 2017 at 05:52:39PM +, Daniel Shahaf wrote: > > I wonder if we should delay the release announcement until we can link > > to a bunch of .deb/.rpm/GUIs/* from it. This way, once we do announce@, > > we can hope for

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Stefan Sperling
On Tue, Jan 24, 2017 at 05:52:39PM +, Daniel Shahaf wrote: > Stefan Sperling wrote on Tue, Jan 24, 2017 at 18:45:37 +0100: > > On Tue, Jan 24, 2017 at 05:08:51PM +, Daniel Shahaf wrote: > > > - Asking downstreams (distros) to make alpha1 packages easily available > > > to opting-in users >

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Daniel Shahaf
Stefan Sperling wrote on Tue, Jan 24, 2017 at 18:45:37 +0100: > On Tue, Jan 24, 2017 at 05:08:51PM +, Daniel Shahaf wrote: > > - Asking downstreams (distros) to make alpha1 packages easily available to > > opting-in users > > Yes we can do that. But this is often ineffective because distros a

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Stefan Sperling
On Tue, Jan 24, 2017 at 05:08:51PM +, Daniel Shahaf wrote: > Stefan Sperling wrote on Tue, Jan 24, 2017 at 12:20:39 +0100: > > I would like to get an 1.10.0 alpha1 released in February. Unless I hear > > objections I will start rolling this alpha release from trunk and call a > > vote on it soo

Re: conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Daniel Shahaf
Stefan Sperling wrote on Tue, Jan 24, 2017 at 12:20:39 +0100: > I would like to get an 1.10.0 alpha1 released in February. Unless I hear > objections I will start rolling this alpha release from trunk and call a > vote on it soon. That all sounds good. However, last time we did that we had barely

conflict resolver status update (roll 1.10.0 alpha 1?)

2017-01-24 Thread Stefan Sperling
Hi, Another update on the new conflict resolver: We have 36 conflict resolver tests, all of which PASS. I have updated the wiki page about conflict tests accordingly: https://wiki.apache.org/subversion/TreeConflictTests The 36 tests we have still do not cover much of the overall problem space. H

conflict resolver status update

2016-11-28 Thread Stefan Sperling
Just a short update on the new conflict resolver: - The resolver now tries to detect nested moves. - Merging incoming additions works. (updates produce text conflicts already without help from the resolver) - Updating incoming moves is now implemented and needs testing. - We have 28 conflict

Re: new svn conflict resolver status update

2016-06-15 Thread Johan Corveleyn
15 PM >> > To: Johan Corveleyn; Subversion Development >> > Subject: Re: new svn conflict resolver status update >> > >> > On Mon, Jun 13, 2016 at 12:50 PM, Stefan Sperling wrote: >> > > On Mon, Jun 13, 2016 at 12:05:27AM +0200, Johan Corveleyn wrote

Re: new svn conflict resolver status update

2016-06-15 Thread Stefan Sperling
On Wed, Jun 15, 2016 at 06:56:56AM +, Markus Schaber wrote: > Hi, > > > -Original Message- > > From: Johan Corveleyn [mailto:jcor...@gmail.com] > > Sent: Tuesday, June 14, 2016 10:15 PM > > To: Johan Corveleyn; Subversion Development > > Subject:

RE: new svn conflict resolver status update

2016-06-14 Thread Markus Schaber
Hi, > -Original Message- > From: Johan Corveleyn [mailto:jcor...@gmail.com] > Sent: Tuesday, June 14, 2016 10:15 PM > To: Johan Corveleyn; Subversion Development > Subject: Re: new svn conflict resolver status update > > On Mon, Jun 13, 2016 at 12:50 PM, Stefan Sp

Re: new svn conflict resolver status update

2016-06-14 Thread Johan Corveleyn
On Mon, Jun 13, 2016 at 12:50 PM, Stefan Sperling wrote: > On Mon, Jun 13, 2016 at 12:05:27AM +0200, Johan Corveleyn wrote: >> To be honest, being able to use the python test framework would be a >> lot more productive for me. Maybe I can look into how to make it >> handle interactive prompting? U

Re: new svn conflict resolver status update

2016-06-14 Thread swdev
Here's a though of the top of my head Say, in a given scenario, you have resolution options A, B, C and D displayed as A) xxx B) xxx C) xxx D) xxx : suggest C: Where suggest C means that the suggested resolution would be option C. You could then have an '--use-suggested-resolution' option that

Re: new svn conflict resolver status update

2016-06-13 Thread Stefan Sperling
On Mon, Jun 13, 2016 at 12:05:27AM +0200, Johan Corveleyn wrote: > To be honest, being able to use the python test framework would be a > lot more productive for me. Maybe I can look into how to make it > handle interactive prompting? Unless there's a reason why this would > be notoriously difficul

Re: new svn conflict resolver status update

2016-06-12 Thread Johan Corveleyn
On Fri, Jun 10, 2016 at 6:45 PM, Stefan Sperling wrote: > I have been regularly working on the new conflict resolver since January. > This is a status update to present the results so far, and what remains > to be done before we can release this. > > The code is on trunk, and not on a branch. We c

new svn conflict resolver status update

2016-06-10 Thread Stefan Sperling
I have been regularly working on the new conflict resolver since January. This is a status update to present the results so far, and what remains to be done before we can release this. The code is on trunk, and not on a branch. We could still disable it without much effort. However, at this point