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

On 05/10/2012 06: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.

Yay! This is a good step in the right direction, Stefan.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development