subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <danie...@elego.de>
Subject Re: vimdiff wrapper for diff-cmd not working with 1.8
Date Thu, 27 Jun 2013 10:07:42 GMT
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
> 



Mime
View raw message