Author: julianfoad
Date: Thu Nov 24 19:42:54 2011
New Revision: 1205964
URL: http://svn.apache.org/viewvc?rev=1205964&view=rev
Log:
* subversion/libsvn_client/merge.c
(do_directory_merge): Un-break the merge tests after r1205929: set
'is_single_file_merge' to false.
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=1205964&r1=1205963&r2=1205964&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Nov 24 19:42:54 2011
@@ -8312,6 +8312,9 @@ do_directory_merge(svn_mergeinfo_catalog
honor_mergeinfo = HONOR_MERGEINFO(merge_b);
record_mergeinfo = RECORD_MERGEINFO(merge_b);
+ /* Note that this is not a single-file merge. */
+ notify_b->is_single_file_merge = FALSE;
+
/* Initialize NOTIFY_B->CHILDREN_WITH_MERGEINFO. See the comment
'THE CHILDREN_WITH_MERGEINFO ARRAY' at the start of this file. */
notify_b->children_with_mergeinfo =
