Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0DE61200B84 for ; Mon, 29 Aug 2016 00:31:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 09126160AC7; Sun, 28 Aug 2016 22:31:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4EB44160AB4 for ; Mon, 29 Aug 2016 00:31:13 +0200 (CEST) Received: (qmail 83560 invoked by uid 500); 28 Aug 2016 22:31:12 -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 83550 invoked by uid 99); 28 Aug 2016 22:31:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Aug 2016 22:31:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 1E5DFC023E for ; Sun, 28 Aug 2016 22:31:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.426 X-Spam-Level: X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id r4b8FSw-hMqj for ; Sun, 28 Aug 2016 22:31:11 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id DFB755F2F0 for ; Sun, 28 Aug 2016 22:31:10 +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 E9B2AE00B8 for ; Sun, 28 Aug 2016 22:31:09 +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 0DA1C3A031D for ; Sun, 28 Aug 2016 22:31:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1758160 - /subversion/trunk/subversion/libsvn_client/conflicts.c Date: Sun, 28 Aug 2016 22:31:08 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160828223109.0DA1C3A031D@svn01-us-west.apache.org> archived-at: Sun, 28 Aug 2016 22:31:14 -0000 Author: rhuijben Date: Sun Aug 28 22:31:08 2016 New Revision: 1758160 URL: http://svn.apache.org/viewvc?rev=1758160&view=rev Log: Allow resolving conflicts on binary files to the base version, just like text files. * subversion/libsvn_client/conflicts.c (binary_conflict_options): Add missing option. Modified: subversion/trunk/subversion/libsvn_client/conflicts.c Modified: subversion/trunk/subversion/libsvn_client/conflicts.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1758160&r1=1758159&r2=1758160&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/conflicts.c (original) +++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Aug 28 22:31:08 2016 @@ -6670,6 +6670,13 @@ static const svn_client_conflict_option_ }, { + svn_client_conflict_option_base_text, + N_("discard local and incoming changes for this binary file"), + NULL, + resolve_text_conflict + }, + + { svn_client_conflict_option_incoming_text, N_("accept incoming version of binary file"), NULL,