Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C62610D33 for ; Thu, 13 Mar 2014 08:49:01 +0000 (UTC) Received: (qmail 80155 invoked by uid 500); 13 Mar 2014 08:49:00 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 79607 invoked by uid 500); 13 Mar 2014 08:48:49 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 77334 invoked by uid 99); 13 Mar 2014 08:48:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 08:48:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 08:48:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0750F23888D7; Thu, 13 Mar 2014 08:48:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1577066 - /subversion/trunk/subversion/libsvn_wc/merge.c Date: Thu, 13 Mar 2014 08:48:19 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140313084820.0750F23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Thu Mar 13 08:48:19 2014 New Revision: 1577066 URL: http://svn.apache.org/r1577066 Log: When merging a file, don't use the pristine install preparation code to create a tempfile, but retrieve the right location properly. * subversion/libsvn_wc/merge.c (includes): Stop including adm_files.h. Use other includes directly. (merge_file_trivial): Create temp file in tempdir, instead of abusing pristine magic. 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=1577066&r1=1577065&r2=1577066&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/merge.c (original) +++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Mar 13 08:48:19 2014 @@ -26,10 +26,11 @@ #include "svn_dirent_uri.h" #include "svn_path.h" #include "svn_pools.h" +#include "svn_props.h" #include "wc.h" -#include "adm_files.h" #include "conflicts.h" +#include "props.h" #include "translate.h" #include "workqueue.h" @@ -725,16 +726,20 @@ merge_file_trivial(svn_skel_t **work_ite { svn_stream_t *tmp_src; svn_stream_t *tmp_dst; + const char *tmp_dir; SVN_ERR(svn_stream_open_readonly(&tmp_src, right_abspath, scratch_pool, scratch_pool)); - SVN_ERR(svn_wc__open_writable_base(&tmp_dst, &right_abspath, - NULL, NULL, - db, target_abspath, - scratch_pool, - scratch_pool)); + SVN_ERR(svn_wc__db_pristine_get_tempdir(&tmp_dir, db, + target_abspath, + scratch_pool, + scratch_pool)); + + SVN_ERR(svn_stream_open_unique(&tmp_dst, &right_abspath, + tmp_dir, svn_io_file_del_none, + scratch_pool, scratch_pool)); SVN_ERR(svn_stream_copy3(tmp_src, tmp_dst, cancel_func, cancel_baton,