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 62ACA18BAF for ; Tue, 22 Mar 2016 15:44:37 +0000 (UTC) Received: (qmail 22498 invoked by uid 500); 22 Mar 2016 15:44:37 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 22464 invoked by uid 500); 22 Mar 2016 15:44:37 -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 22454 invoked by uid 99); 22 Mar 2016 15:44:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2016 15:44:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id B8260C1647 for ; Tue, 22 Mar 2016 15:44:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.99 X-Spam-Level: X-Spam-Status: No, score=0.99 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id BjMXXNAYRyXr for ; Tue, 22 Mar 2016 15:44:36 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 20ECB5F479 for ; Tue, 22 Mar 2016 15:44:36 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 618FEE00E9 for ; Tue, 22 Mar 2016 15:44:35 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 36A953A0113 for ; Tue, 22 Mar 2016 15:44:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1736206 - /subversion/trunk/subversion/svn/conflict-callbacks.c Date: Tue, 22 Mar 2016 15:44:35 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160322154435.36A953A0113@svn01-us-west.apache.org> Author: stsp Date: Tue Mar 22 15:44:34 2016 New Revision: 1736206 URL: http://svn.apache.org/viewvc?rev=1736206&view=rev Log: * subversion/svn/conflict-callbacks.c (handle_tree_conflict): Further formatting tweak for conflict prompt. Modified: subversion/trunk/subversion/svn/conflict-callbacks.c Modified: subversion/trunk/subversion/svn/conflict-callbacks.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1736206&r1=1736205&r2=1736206&view=diff ============================================================================== --- subversion/trunk/subversion/svn/conflict-callbacks.c (original) +++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Mar 22 15:44:34 2016 @@ -1441,12 +1441,11 @@ handle_tree_conflict(svn_boolean_t *reso conflict, scratch_pool, scratch_pool)); SVN_ERR(svn_cmdline_fprintf( stderr, scratch_pool, - _("Tree conflict on '%s'\n" - "- Local change:\n%s\n" - "- Incoming change:\n%s\n"), + _("Tree conflict on '%s':\n" + "\n%s\n%s\n\n"), svn_cl__local_style_skip_ancestor(path_prefix, svn_client_conflict_get_local_abspath(conflict), scratch_pool), - local_change_description, incoming_change_description)); + incoming_change_description, local_change_description)); SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict, scratch_pool, scratch_pool));