svn commit: r1337519 - /subversion/trunk/subversion/svn/resolve-cmd.c

[st...@apache.org]

Author: stsp
Date: Sat May 12 12:22:19 2012
New Revision: 1337519

URL: http://svn.apache.org/viewvc?rev=1337519&view=rev
Log:
* subversion/svn/resolve-cmd.c
  (svn_cl__resolve): When determining the default depth to use, test
    opt_state->accept_which against the correct type of constant.
    Makes 'svn resolve' recursive by default, as intended, rather than
    always using depth 'emtpy'. I introduced this problem in last-minute
    edits for r1336929.

Modified:
    subversion/trunk/subversion/svn/resolve-cmd.c

Modified: subversion/trunk/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1337519&r1=1337518&r2=1337519&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Sat May 12 12:22:19 2012
@@ -96,7 +96,7 @@ svn_cl__resolve(apr_getopt_t *os,
 
   if (opt_state->depth == svn_depth_unknown)
     {
-      if (opt_state->accept_which == svn_wc_conflict_choose_unspecified)
+      if (opt_state->accept_which == svn_cl__accept_unspecified)
         opt_state->depth = svn_depth_infinity;
       else
         opt_state->depth = svn_depth_empty;