svn commit: r1351796 - /subversion/trunk/subversion/libsvn_client/merge.c

[st...@apache.org]

Author: stsp
Date: Tue Jun 19 18:31:11 2012
New Revision: 1351796

URL: http://svn.apache.org/viewvc?rev=1351796&view=rev
Log:
Follow-up to r1351792:

* subversion/libsvn_client/merge.c
  (merge_locked, merge_peg_locked, do_symmetric_merge_locked): Fix copy-pasted
   name of the local variable 'resolve_conflicts_post_update' to say
   'resolve_conflicts_post_merge'.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1351796&r1=1351795&r2=1351796&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jun 19 18:31:11 2012
@@ -9546,7 +9546,7 @@ merge_locked(const char *source1,
   apr_pool_t *sesspool;
   svn_boolean_t same_repos;
   /* Resolve conflicts post-update for 1.7 and above API users. */
-  svn_boolean_t resolve_conflicts_post_update = (ctx->conflict_func2 != NULL);
+  svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
   svn_wc_conflict_resolver_func2_t conflict_func2;
   void *conflict_baton2;
 
@@ -9585,7 +9585,7 @@ merge_locked(const char *source1,
                     &yca, source1_loc, source2_loc, ra_session1, ctx,
                     scratch_pool, scratch_pool));
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Remove the conflict resolution callback from the client context.
        * We invoke it after of the merge instead of during the merge. */
@@ -9697,7 +9697,7 @@ merge_locked(const char *source1,
   if (err)
     return svn_error_trace(err);
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Resolve conflicts within the merge target. */
       SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, target_abspath,
@@ -10973,7 +10973,7 @@ merge_peg_locked(const char *source_path
   svn_error_t *err;
   svn_boolean_t same_repos;
   /* Resolve conflicts post-update for 1.7 and above API users. */
-  svn_boolean_t resolve_conflicts_post_update = (ctx->conflict_func2 != NULL);
+  svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
   svn_wc_conflict_resolver_func2_t conflict_func2;
   void *conflict_baton2;
 
@@ -11000,7 +11000,7 @@ merge_peg_locked(const char *source_path
   /* Check for same_repos. */
   same_repos = is_same_repos(&target->loc, source_loc, TRUE /* strict_urls */);
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Remove the conflict resolution callback from the client context.
        * We invoke it after of the merge instead of during the merge. */
@@ -11023,7 +11023,7 @@ merge_peg_locked(const char *source_path
   /* We're done with our RA session. */
   svn_pool_destroy(sesspool);
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Resolve conflicts within the merge target. */
       SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, target_abspath,
@@ -11632,14 +11632,14 @@ do_symmetric_merge_locked(const svn_clie
   svn_boolean_t use_sleep = FALSE;
   svn_error_t *err;
   /* Resolve conflicts post-update for 1.7 and above API users. */
-  svn_boolean_t resolve_conflicts_post_update = (ctx->conflict_func2 != NULL);
+  svn_boolean_t resolve_conflicts_post_merge = (ctx->conflict_func2 != NULL);
   svn_wc_conflict_resolver_func2_t conflict_func2;
   void *conflict_baton2;
 
   SVN_ERR(open_target_wc(&target, target_abspath, TRUE, TRUE, TRUE,
                          ctx, scratch_pool, scratch_pool));
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Remove the conflict resolution callback from the client context.
        * We invoke it after of the merge instead of during the merge. */
@@ -11699,7 +11699,7 @@ do_symmetric_merge_locked(const svn_clie
 
   SVN_ERR(err);
 
-  if (resolve_conflicts_post_update)
+  if (resolve_conflicts_post_merge)
     {
       /* Resolve conflicts within the merge target. */
       SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, target_abspath,