[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Viewing diffs in unified format in vim

From: <bd_at_bc-bd.org>
Date: Tue, 30 Sep 2008 10:47:40 +0000

On Tue, Sep 30, 2008 at 03:25:07AM -0700, Szabolcs HorvŠt wrote:
> On Sep 1, 1:11†pm, b..._at_bc-bd.org wrote:
> > Hello List,
> >
> > I have been trying to setup tortoisesvn to display a unified diff using gvim.exe
> > when I select "SVN Diff"
> >
> > I tried using a batch file, a vbs script and some vim command line voodoo, but
> > everything failed.
> >
> > Does anyone have some info for me on how to set this up.
> >
>
> No need to complicate things.
>
> Go to TSVN settings -> External programs -> Diff viewer, and set up
> vim as the external diff viewer there. The command is "\path\to
> \gvim.exe -d %base %mine"

While this starts vim, it will use vim's internal diff viewer.

But I'd like to see the changes as a unified diff, e.g.

$VIMHOME/diff -u %base %mine | $VIMHOME/vim -

However that will not work, no diff window will be opened ($VIMHOME used in this
mail as placeholder, the settings have the full path configured)

-- 
BOFH excuse #201:
RPC_PMAP_FAILURE
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-30 12:47:36 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.