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
> > b/subversion/include/svn_client.h
> > index 9bbe62b..f456c92 100644
> > --- a/subversion/include/svn_client.h
> > +++ b/subversion/include/svn_client.h
> > @@ -4718,6 +4718,20 @@ svn_client_conflict_option_id_t
> > svn_client_conflict_option_get_id(svn_client_conflict_option_t *option);
> >
> > [...]
> >
> > add_resolution_option(*options, conflict,
> > svn_client_conflict_option_merged_text,
> > + _("Mark as resolved"),
> > _("accept binary file as it appears in the working copy"),
> > resolve_text_conflict);
> Not sure whether "Mark as resolved" means much to the user. Maybe
> "Accept/Use current version" would be easier to get? Or maybe
> "Accept/Use current" to keep the label consistent with the style of the
> others.
To avoid yet another round-trip for Patrick, I'd prefer us to focus on
the mechanical nature of this change, which is about moving these labels
as-is into the library and exposing them via API.
We can still tweak these strings after this change is committed (and I
agree they should be changed).
