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

[ju...@apache.org]

Author: julianfoad
Date: Fri May 11 14:26:17 2012
New Revision: 1337178

URL: http://svn.apache.org/viewvc?rev=1337178&view=rev
Log:
* subversion/libsvn_client/merge.c
  (do_directory_merge): Remove a redundant test: the 'honor_mergeinfo' flag
    must be true at this point in the function, as we returned earlier if it
    was 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=1337178&r1=1337177&r2=1337178&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri May 11 14:26:17 2012
@@ -8550,7 +8550,7 @@ do_directory_merge(svn_mergeinfo_catalog
   range.end = source->loc2->rev;
   range.inheritable = TRUE;
 
-  if (honor_mergeinfo && !merge_b->reintegrate_merge)
+  if (!merge_b->reintegrate_merge)
     {
       svn_revnum_t new_range_start, start_rev;
       apr_pool_t *iterpool = svn_pool_create(scratch_pool);