On 12 October 2016 at 17:06, James McCoy <james...@jamessan.com> wrote: > On Wed, Oct 12, 2016 at 04:44:10PM +0200, Ivan Zhakov wrote: >> On 12 October 2016 at 15:38, Patrick Steinhardt >> <patrick.steinha...@elegosoft.com> 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/svn_client.h: >> > - Provide function `svn_client_conflict_option_label` >> > * libsvn_client/conflicts.c: >> > - Implement function `svn_client_conflict_option_label` >> > - Introduce and set label field for svn_conflict_option_t >> > * svn/conflict-callbacks.c: >> > - Split client-specific and built-in resolver options >> > - Implement conversion from built-in resolvers to >> > client-specific options >> > ]] >> >> Hi Patrick. Thank you for the patch. >> >> See my review inline: >> > Index: subversion/include/svn_client.h >> > =================================================================== >> > --- subversion/include/svn_client.h (revision 1764453) >> > +++ subversion/include/svn_client.h (working copy) >> > @@ -4718,6 +4718,22 @@ >> > svn_client_conflict_option_get_id(svn_client_conflict_option_t *option); >> > >> > /** >> > + * Return a textual human-readable label of @a option, allocated in >> > + * @a result_pool. The label is encoded in UTF-8 and may contain >> > + * up to three words. >> May replace 'may contain up to three words' -> 'usually contain up to >> three words'? > > 'usually contain' -> 'usually contains'. > Sure!
-- Ivan Zhakov
