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 B67E098BE for ; Sun, 5 Aug 2012 13:42:03 +0000 (UTC) Received: (qmail 25663 invoked by uid 500); 5 Aug 2012 13:42:03 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 25590 invoked by uid 500); 5 Aug 2012 13:42:03 -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 25582 invoked by uid 99); 5 Aug 2012 13:42:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Aug 2012 13:42:03 +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; Sun, 05 Aug 2012 13:42:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CF2D238890B; Sun, 5 Aug 2012 13:41:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369584 - /subversion/trunk/subversion/svn/file-merge.c Date: Sun, 05 Aug 2012 13:41:19 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120805134119.3CF2D238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Sun Aug 5 13:41:18 2012 New Revision: 1369584 URL: http://svn.apache.org/viewvc?rev=1369584&view=rev Log: * subversion/svn/file-merge.c (svn_cl__merge_file): Leave the file in conflict if installing the merged result fails and extend the corresponding error message accordingly. Modified: subversion/trunk/subversion/svn/file-merge.c Modified: subversion/trunk/subversion/svn/file-merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1369584&r1=1369583&r2=1369584&view=diff ============================================================================== --- subversion/trunk/subversion/svn/file-merge.c (original) +++ subversion/trunk/subversion/svn/file-merge.c Sun Aug 5 13:41:18 2012 @@ -889,8 +889,9 @@ svn_cl__merge_file(const char *base_path SVN_ERR(svn_io_file_close(latest_file, scratch_pool)); SVN_ERR(svn_io_file_close(merged_file, scratch_pool)); + /* Start out assuming that conflicts remain. */ if (remains_in_conflict) - *remains_in_conflict = (fmb.remains_in_conflict || fmb.abort_merge); + *remains_in_conflict = TRUE; if (fmb.abort_merge) { @@ -906,12 +907,21 @@ svn_cl__merge_file(const char *base_path SVN_ERR_W(svn_io_file_move(merged_file_name, merged_path, scratch_pool), apr_psprintf(scratch_pool, - _("Could not write merged result to '%s', " - "saved instead at '%s'.\n"), - svn_dirent_local_style(merged_path, - scratch_pool), + _("Could not write merged result to '%s', saved " + "instead at '%s'.\n'%s' remains in conflict.\n"), + svn_dirent_local_style( + svn_dirent_skip_ancestor(path_prefix, merged_path), + scratch_pool), svn_dirent_local_style(merged_file_name, - scratch_pool))); + scratch_pool), + svn_dirent_local_style( + svn_dirent_skip_ancestor(path_prefix, wc_path), + scratch_pool))); + + /* The merge was not aborted and we could install the merged result. The + * file remains in conflict unless all conflicting sections were resolved. */ + if (remains_in_conflict) + *remains_in_conflict = fmb.remains_in_conflict; if (fmb.remains_in_conflict) SVN_ERR(svn_cmdline_printf(