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

[rh...@apache.org]

Author: rhuijben
Date: Mon Feb  4 18:20:49 2013
New Revision: 1442285

URL: http://svn.apache.org/viewvc?rev=1442285&view=rev
Log:
* subversion/libsvn_client/merge.c
  (notify_merge_begin): Tweak the number of begin merge notifications for
    non ancestrical merges.

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=1442285&r1=1442284&r2=1442285&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Feb  4 18:20:49 2013
@@ -3403,11 +3403,11 @@ notify_merge_begin(merge_cmd_baton_t *me
       notify_abspath = child->abspath;
       n_range = APR_ARRAY_IDX(child->remaining_ranges, 0, svn_merge_range_t *);
     }
-  else if (merge_b->merge_source.ancestral)
+  else
     {
-      merge_b->notified_merge_begin = TRUE;
+      merge_b->notified_merge_begin = TRUE; /* Notify just once per drive */
 
-      if (merge_b->current_range)
+      if (merge_b->merge_source.ancestral && merge_b->current_range)
         n_range = svn_merge_range_dup(merge_b->current_range, scratch_pool);
     }