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

Solved: Viewing diffs in unified format in vim

From: <bd_at_bc-bd.org>
Date: Wed, 1 Oct 2008 10:30:41 +0000

On Tue, Sep 30, 2008 at 08:37:17AM -0700, Szabolcs HorvŠt wrote:
>
>
> On Sep 30, 3:12†pm, b..._at_bc-bd.org wrote:
> >
> > Yes I tried a batch file and that does not work. That is exactly why I asked on
> > the list.
> >
> > Settings:
> > C:\Documents and Settings\stefanv\My Documents\diff.bat "%base" "%mine"
> >
> > This is diff.bat:
> >
> > "C:\Program Files\Vim\vim71\diff.exe" -u "%1" "%2" > C:\Temp\diff.txt
> > "C:\Program Files\Vim\vim71\gvim.exe" C:\Temp\diff.txt
> >
> > What happens is that a (I guess command.exe) window opens for a split second,
> > closes again and nothing.
> >
> > I changed the diff.bat to simply contain pause, same result.
>
> Hello Stefan,
>
> I put some pauses into your bat file to see what happens. It appears
> that no less than three quotes accumulated around the file names. So
> remove the quotes from %base and %mine, and %1 and %2, and use this
> diff.cmd file:
>
> "C:\Program Files\Vim\vim71\diff.exe" -u %1 %2 > C:\Temp\diff.txt
> start "" "C:\Program Files\Vim\vim71\gvim.exe" C:\Temp\diff.txt
>
> This one works for me.

Thanks, this also works for me. Not to sum it up:

1) Create a batch file containing these lines:

"C:\Program Files\Vim\vim71\diff.exe" -u %1 %2 > C:\Temp\diff.txt
start "" "C:\Program Files\Vim\vim71\gvim.exe" C:\Temp\diff.txt

2) Set Externalt diff to that batch file, e.g.:

"Path\to\diff.bat" %base %mine

Thanks for all the help.

        Stefan

-- 
You will gain money by a fattening action.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-01 12:30:38 CEST

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