Re: [PATCH v3] Conflict option labels

2016-10-14 Thread Ivan Zhakov
On 14 October 2016 at 12:06, Ivan Zhakov wrote: > On 14 October 2016 at 11:43, Ivan Zhakov wrote: >> On 13 October 2016 at 17:26, Patrick Steinhardt wrote: >>> Hi, >>> >>> the third version re-adds the result pool to >>>

Re: [PATCH v3] Conflict option labels

2016-10-14 Thread Ivan Zhakov
On 14 October 2016 at 11:43, Ivan Zhakov wrote: > On 13 October 2016 at 17:26, Patrick Steinhardt wrote: >> Hi, >> >> the third version re-adds the result pool to >> `svn_client_conflict_option_get_lazel`. >> > [...] >> @@ -582,15 +604,16 @@ prompt_string(const

Re: [PATCH v3] Conflict option labels

2016-10-14 Thread Ivan Zhakov
On 13 October 2016 at 17:26, Patrick Steinhardt wrote: > Hi, > > the third version re-adds the result pool to > `svn_client_conflict_option_get_lazel`. > [...] > @@ -582,15 +604,16 @@ prompt_string(const resolver_option_t *options, > } >else > { > -

Re: [PATCH v3] Conflict option labels

2016-10-14 Thread Stefan
On 10/14/2016 10:27 AM, Stefan Sperling wrote: > On Thu, Oct 13, 2016 at 05:59:01PM +0200, Stefan wrote: >> 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 >>>

Re: [PATCH v3] Conflict option labels

2016-10-14 Thread Ivan Zhakov
On 14 October 2016 at 10:27, Stefan Sperling wrote: > On Thu, Oct 13, 2016 at 05:59:01PM +0200, Stefan wrote: >> 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

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 > +++