svn commit: r1026270 - /subversion/trunk/subversion/libsvn_wc/merge.c

[stsp]

Author: stsp
Date: Fri Oct 22 09:50:04 2010
New Revision: 1026270

URL: http://svn.apache.org/viewvc?rev=1026270&view=rev
Log:
Revert r1026105 as it makes the buildbots unhappy.
I'll try to come up with a better fix later.

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1026270&r1=1026269&r2=1026270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Oct 22 09:50:04 2010
@@ -1039,10 +1039,7 @@ merge_text_file(svn_skel_t **work_items,
         }
 
       if (*merge_outcome == svn_wc_merge_merged)
-        {
-          SVN_ERR(svn_io_remove_file2(result_target, TRUE, scratch_pool));
-          return SVN_NO_ERROR;
-        }
+        return SVN_NO_ERROR;
     }
   else if (contains_conflicts && dry_run)
       *merge_outcome = svn_wc_merge_conflict;
@@ -1081,8 +1078,6 @@ merge_text_file(svn_skel_t **work_items,
                                             result_pool, scratch_pool));
       *work_items = svn_wc__wq_merge(*work_items, work_item, result_pool);
     }
-  else
-    SVN_ERR(svn_io_remove_file2(result_target, TRUE, scratch_pool));
 
   return SVN_NO_ERROR;
 }