Re: [PATCH] Conflict option labels

2016-10-12 Thread Ivan Zhakov
On 12 October 2016 at 17:06, James McCoy wrote: > On Wed, Oct 12, 2016 at 04:44:10PM +0200, Ivan Zhakov wrote: >> On 12 October 2016 at 15:38, Patrick Steinhardt >> wrote: >> > Hi, >> > >> > please find attached a patch pulling out the short descriptions >> > of conflict resolution options from t

Re: [PATCH] Conflict option labels

2016-10-12 Thread James McCoy
On Wed, Oct 12, 2016 at 04:44:10PM +0200, Ivan Zhakov wrote: > On 12 October 2016 at 15:38, Patrick Steinhardt > wrote: > > Hi, > > > > please find attached a patch pulling out the short descriptions > > of conflict resolution options from the client and puts them into > > libsvn_client. > > > > [

Re: [PATCH] Conflict option labels

2016-10-12 Thread Patrick Steinhardt
On Wed, Oct 12, 2016 at 04:32:24PM +0200, Stefan Sperling wrote: > On Wed, Oct 12, 2016 at 03:38:02PM +0200, Patrick Steinhardt wrote: [snip] > > + svn_client_conflict_option_t *option, > > + apr_pool_t *result_pool, > > +

Re: [PATCH] Conflict option labels

2016-10-12 Thread Patrick Steinhardt
On Wed, Oct 12, 2016 at 04:44:10PM +0200, Ivan Zhakov wrote: > On 12 October 2016 at 15:38, Patrick Steinhardt > wrote: > > Hi, > > > > please find attached a patch pulling out the short descriptions > > of conflict resolution options from the client and puts them into > > libsvn_client. > > > > [

Re: [PATCH] Conflict option labels

2016-10-12 Thread Ivan Zhakov
On 12 October 2016 at 15:38, Patrick Steinhardt wrote: > Hi, > > please find attached a patch pulling out the short descriptions > of conflict resolution options from the client and puts them into > libsvn_client. > > [[ > Move conflict resolution options' labels out of the client > > * include/sv

Re: [PATCH] Conflict option labels

2016-10-12 Thread Stefan Sperling
On Wed, Oct 12, 2016 at 03:38:02PM +0200, Patrick Steinhardt wrote: > Hi, > > please find attached a patch pulling out the short descriptions > of conflict resolution options from the client and puts them into > libsvn_client. > > [[ > Move conflict resolution options' labels out of the client >

[PATCH] Conflict option labels

2016-10-12 Thread Patrick Steinhardt
Hi, please find attached a patch pulling out the short descriptions of conflict resolution options from the client and puts them into libsvn_client. [[ Move conflict resolution options' labels out of the client * include/svn_client.h: - Provide function `svn_client_conflict_option_label` * lib