You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2014/03/19 23:36:36 UTC

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

Author: philip
Date: Wed Mar 19 22:36:36 2014
New Revision: 1579429

URL: http://svn.apache.org/r1579429
Log:
* subversion/libsvn_client/merge.c
  (merge_dir_deleted): Remove redundant code, the same condition
   is checked a few lines earlier.

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=1579429&r1=1579428&r2=1579429&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Mar 19 22:36:36 2014
@@ -3144,8 +3144,6 @@ merge_dir_deleted(const char *relpath,
 
       if (delb->found_edit)
         same = FALSE;
-      else if (merge_b->force_delete)
-        same = TRUE;
       else
         {
           apr_array_header_t *ignores;