subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1446356 - in /subversion/trunk/subversion/svn: cl.h conflict-callbacks.c merge-cmd.c switch-cmd.c update-cmd.c
Date Thu, 14 Feb 2013 22:01:09 GMT
Author: julianfoad
Date: Thu Feb 14 22:01:09 2013
New Revision: 1446356

URL: http://svn.apache.org/r1446356
Log:
Remove the 'depth' parameter from svn_cl__resolve_postponed_conflicts(), as
it was mis-used and unnecessary (and undocumented).

The function resolves the conflicts on a pre-selected set of specific paths.
It was resolving to the specified depth within each such path, but the
callers were mistakenly passing the depth of the overall merge/update/switch
operation.

* subversion/svn/cl.h,
  subversion/svn/conflict-callbacks.c
  (svn_cl__resolve_postponed_conflicts): Remove the 'depth' parameter.

* subversion/svn/merge-cmd.c
  (svn_cl__merge): Adjust caller.

* subversion/svn/switch-cmd.c
  (svn_cl__switch): Adjust caller.

* subversion/svn/update-cmd.c
  (svn_cl__update): Adjust caller.

Modified:
    subversion/trunk/subversion/svn/cl.h
    subversion/trunk/subversion/svn/conflict-callbacks.c
    subversion/trunk/subversion/svn/merge-cmd.c
    subversion/trunk/subversion/svn/switch-cmd.c
    subversion/trunk/subversion/svn/update-cmd.c

Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1446356&r1=1446355&r2=1446356&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Thu Feb 14 22:01:09 2013
@@ -382,7 +382,6 @@ svn_cl__conflict_func_postpone(svn_wc_co
  */
 svn_error_t *
 svn_cl__resolve_postponed_conflicts(void *baton,
-                                    svn_depth_t depth,
                                     svn_cl__accept_t accept_which,
                                     const char *editor_cmd,
                                     svn_client_ctx_t *ctx,

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1446356&r1=1446355&r2=1446356&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Feb 14 22:01:09 2013
@@ -1159,7 +1159,6 @@ get_postponed_conflicted_paths(void *bat
 
 svn_error_t *
 svn_cl__resolve_postponed_conflicts(void *baton,
-                                    svn_depth_t depth,
                                     svn_cl__accept_t accept_which,
                                     const char *editor_cmd,
                                     svn_client_ctx_t *ctx,
@@ -1201,7 +1200,7 @@ svn_cl__resolve_postponed_conflicts(void
                                                           scratch_pool));
       ctx->conflict_baton2 = b;
 
-      err = svn_client_resolve(local_abspath, depth,
+      err = svn_client_resolve(local_abspath, svn_depth_empty,
                                svn_wc_conflict_choose_unspecified,
                                ctx, iterpool);
 

Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1446356&r1=1446355&r2=1446356&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Feb 14 22:01:09 2013
@@ -592,7 +592,6 @@ svn_cl__merge(apr_getopt_t *os,
        * default 'postpone' resolver which remembers what was postponed.) */
       if (!err && ctx->conflict_func2 == svn_cl__conflict_func_postpone)
         err = svn_cl__resolve_postponed_conflicts(ctx->conflict_baton2,
-                                                  opt_state->depth,
                                                   opt_state->accept_which,
                                                   opt_state->editor_cmd,
                                                   ctx, pool);

Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=1446356&r1=1446355&r2=1446356&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Thu Feb 14 22:01:09 2013
@@ -199,7 +199,6 @@ svn_cl__switch(apr_getopt_t *os,
     }
 
   err = svn_cl__resolve_postponed_conflicts(ctx->conflict_baton2,
-                                            opt_state->depth,
                                             opt_state->accept_which,
                                             opt_state->editor_cmd,
                                             ctx, scratch_pool);

Modified: subversion/trunk/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/update-cmd.c?rev=1446356&r1=1446355&r2=1446356&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/update-cmd.c (original)
+++ subversion/trunk/subversion/svn/update-cmd.c Thu Feb 14 22:01:09 2013
@@ -195,7 +195,6 @@ svn_cl__update(apr_getopt_t *os,
     }
 
   err = svn_cl__resolve_postponed_conflicts(ctx->conflict_baton2,
-                                            opt_state->depth,
                                             opt_state->accept_which,
                                             opt_state->editor_cmd,
                                             ctx, scratch_pool);



Mime
View raw message