subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r932270 - /subversion/trunk/subversion/libsvn_wc/merge.c
Date Fri, 09 Apr 2010 07:05:28 GMT
Author: gstein
Date: Fri Apr  9 07:05:28 2010
New Revision: 932270

URL: http://svn.apache.org/viewvc?rev=932270&view=rev
Log:
In certain conditions, the merge process was not removing its temp files.

* subversion/libsvn_wc/merge.c:
  (eval_conflict_func_result): remove temp files for theirs/mine-conflict

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=932270&r1=932269&r2=932270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Apr  9 07:05:28 2010
@@ -506,6 +506,14 @@ eval_conflict_func_result(enum svn_wc_me
           SVN_ERR(svn_stream_close(chosen_stream));
           SVN_ERR(svn_wc__loggy_copy(db, adm_abspath,
                                      chosen_path, target_abspath, pool));
+          {
+            const svn_skel_t *work_item;
+
+            SVN_ERR(svn_wc__wq_build_file_remove(&work_item,
+                                                 db, chosen_path,
+                                                 pool, pool));
+            SVN_ERR(svn_wc__db_wq_add(db, adm_abspath, work_item, pool));
+          }
           *merge_outcome = svn_wc_merge_merged;
           return SVN_NO_ERROR;
         }



Mime
View raw message