Author: julianfoad
Date: Mon Jan 23 11:06:49 2012
New Revision: 1234742
URL: http://svn.apache.org/viewvc?rev=1234742&view=rev
Log:
* subversion/libsvn_client/merge.c
(find_unmerged_mergeinfo_subroutine): Simplify by removing an unnecessary
mergeinfo intersection: (A - (B intersect A)) simplifies to (A - B).
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=1234742&r1=1234741&r2=1234742&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Jan 23 11:06:49 2012
@@ -9898,7 +9898,6 @@ find_unmerged_mergeinfo_subroutine(svn_m
apr_pool_t *scratch_pool)
{
svn_mergeinfo_t source_history_as_mergeinfo;
- svn_mergeinfo_t common_mergeinfo;
/* Get the source path's natural history and merge it into source
path's explicit or inherited mergeinfo. */
@@ -9915,13 +9914,8 @@ find_unmerged_mergeinfo_subroutine(svn_m
corresponding target's history is *not* part of source_path's total
history; because it is neither shared history nor was it ever merged
from the target to the source. */
- SVN_ERR(svn_mergeinfo_intersect2(&common_mergeinfo,
- source_mergeinfo,
- target_history_as_mergeinfo, TRUE,
- scratch_pool, scratch_pool));
-
SVN_ERR(svn_mergeinfo_remove2(filtered_mergeinfo_p,
- common_mergeinfo,
+ source_mergeinfo,
target_history_as_mergeinfo, TRUE,
result_pool, scratch_pool));
return SVN_NO_ERROR;
