Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CFB5CC041 for ; Thu, 27 Jun 2013 10:08:14 +0000 (UTC) Received: (qmail 90495 invoked by uid 500); 27 Jun 2013 10:08:14 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 90329 invoked by uid 500); 27 Jun 2013 10:08:13 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 89924 invoked by uid 99); 27 Jun 2013 10:08:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 10:08:12 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [78.47.87.163] (HELO mx0.elegosoft.com) (78.47.87.163) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 10:08:07 +0000 Received: from localhost (localhost [127.0.0.1]) by mx0.elegosoft.com (Postfix) with ESMTP id 6472BDE05B; Thu, 27 Jun 2013 12:07:46 +0200 (CEST) Received: from mx0.elegosoft.com ([127.0.0.1]) by localhost (mx0.elegosoft.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ifTaURwqrOL5; Thu, 27 Jun 2013 12:07:46 +0200 (CEST) Received: from lp-shahaf.local (bzq-79-177-205-62.red.bezeqint.net [79.177.205.62]) by mx0.elegosoft.com (Postfix) with ESMTPSA id C333CDE052; Thu, 27 Jun 2013 12:07:45 +0200 (CEST) Date: Thu, 27 Jun 2013 13:07:42 +0300 From: Daniel Shahaf To: Michael Schlottke Cc: Philip Martin , Ben Reser , users@subversion.apache.org, Subversion Development Subject: Re: vimdiff wrapper for diff-cmd not working with 1.8 Message-ID: <20130627100742.GB3011@lp-shahaf.local> References: <7ECEFDD8-9AA9-472B-8F24-05CE2FA59A04@aia.rwth-aachen.de> <87a9mn9djr.fsf@ntlworld.com> <833A6E79-39DE-4A86-9D83-64B4F2E838E7@aia.rwth-aachen.de> <87mwqmjyin.fsf@ntlworld.com> <87zjujpph5.fsf@ntlworld.com> <35887254-9E93-44F5-9D9A-06C872DB72EB@aia.rwth-aachen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <35887254-9E93-44F5-9D9A-06C872DB72EB@aia.rwth-aachen.de> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Checked: Checked by ClamAV on apache.org Michael Schlottke wrote on Wed, Jun 26, 2013 at 17:34:15 +0200: > > On Jun 21, 2013, at 15:23 , Philip Martin wrote: > > Another user raised the issue > > > > http://subversion.tigris.org/issues/show_bug.cgi?id=4382 > > > > Using '--diff-cmd colordiff' to get coloured output no longer works. > > > > Here's a solution that requires the user to mark the command as > > requiring direct access. Log and patch: > > > > Allow the user to bypass the temporary spool file when invoking an > > external diff command. This allows commands that expect to see > > a terminal to work. The user adds the prefix 'svn:direct:' to the > > command and Subversion passes the stream's file rather than creating > > a spool file. So > > > > --diff-cmd foo > > > > runs foo with a spool file and > > > > --diff-cmd svn:direct:foo > > > > runs foo with the stream's file. > > I can confirm that your patch works for me (OS X Lion and Linux). > Thanks for the quick fix! Keeping my fingers crossed that this will > make it into the repository soon. > I believe http://svn.apache.org/r1497002 fixes this issue (without the svn:direct: prefix), and is proposed for backport towards 1.8.1. Daniel > Michael >