You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/01 21:25:10 UTC
svn commit: r1441617 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: rhuijben
Date: Fri Feb 1 20:25:10 2013
New Revision: 1441617
URL: http://svn.apache.org/viewvc?rev=1441617&view=rev
Log:
* subversion/libsvn_client/merge.c
(do_file_merge): Following up on r1441566, reset related variables in the
same place instead of a few lines apart.
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=1441617&r1=1441616&r2=1441617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb 1 20:25:10 2013
@@ -7200,7 +7200,9 @@ do_file_merge(svn_mergeinfo_catalog_t re
svn_pool_clear(iterpool);
+ /* Ensure any subsequent drives gets their own notification. */
merge_b->current_range = r;
+ merge_b->notified_merge_begin = FALSE;
/* While we currently don't allow it, in theory we could be
fetching two fulltexts from two different repositories here. */
@@ -7314,10 +7316,6 @@ do_file_merge(svn_mergeinfo_catalog_t re
processor,
iterpool));
}
-
- /* Ensure any subsequent drives gets their own notification. */
- merge_b->notified_merge_begin = FALSE;
-
if ((i < (ranges_to_merge->nelts - 1))
&& is_path_conflicted_by_merge(merge_b))
{
@@ -7326,6 +7324,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
}
}
merge_b->current_range = NULL;
+ merge_b->notified_merge_begin = FALSE;
} /* !merge_b->record_only */
/* Record updated WC mergeinfo to account for our new merges, minus