[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1336929 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_client/resolved.c libsvn_wc/conflicts.c svn/conflict-callbacks.c svn/main.c svn/resolve-cmd.c

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 10 May 2012 19:22:56 -0400

Should
On May 10, 2012 12:28 PM, <stsp_at_apache.org> wrote:
>
> Author: stsp
> Date: Thu May 10 22:28:13 2012
> New Revision: 1336929
>
> URL: http://svn.apache.org/viewvc?rev=1336929&view=rev
> Log:
> Make 'svn resolve' invoke the interactive conflict resolution callback
> for all conflicted paths in the working copy. The --accept option is
> no longer mandatory.
>
> This is work in progress. Some interactive features don't work yet when
> the resolver is invoked via 'svn resolve' (e.g. the diff-full option seems
> to be broken.)
>
> * subversion/include/private/svn_wc_private.h
> (svn_wc__resolve_conflicts): Declare.
>
> * subversion/include/svn_wc.h
> (svn_wc_conflict_choice_t): Add new value
svn_wc_conflict_choose_unspecified.
>
> * subversion/libsvn_wc/conflicts.c
> (resolve_one_conflict): Accept conflict_func and conflict_baton
parameters,
> and invoke the conflict function if the pre-defined conflict choice is
> 'unspecified'.
> (recursive_resolve_conflict): Accept conflict_func and conflict_baton
> parameters, to be ultimately passed on to resolve_one_conflict().
> (svn_wc__resolve_conflicts): New API that allows higher layers to invoke
> conflict resolution on all items.
> (svn_wc_resolved_conflict5): Re-implement as wrapper around the new
> svn_wc__resolve_conflicts() function, passing NULL for the conflict
callback.
>
> * subversion/libsvn_client/resolved.c
> (svn_client_resolve): Call svn_wc__resolve_conflicts() instead of
> svn_wc_resolved_conflict5().

Should svn_wc_resolved_conflict5 be deprecated? Seems like it.

("Use svn_client_FOO instead")

Cheers,
-g
Received on 2012-05-11 01:23:30 CEST

This is an archived mail posted to the Subversion Dev mailing list.