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

Re: color coded diff viewer

From: Duncan Murdoch <murdoch_at_stats.uwo.ca>
Date: 2004-11-03 02:44:53 CET

On Fri, 29 Oct 2004 17:40:13 -0400, Matt Pounsett
<matt.pounsett@cira.ca> wrote:

>
>On Oct 26, 2004, at 18:24, v4r4n wrote:
>
>> I guess no one has bothered to 'colorize' their diff output??
>
>svn diff foo.c | vim -R -
>
>works for me.. I get nicely syntax-highlighted diff output.
>
>Note that this requires that you're using a colour-capable term type,
>and that your editor of choice recognizes that term type and does
>colour syntax highlighting. This should work equally well on a Windows
>machine with win32 vim installed, as it uses the same syntax rules
>everywhere.

Sorry if I'm jumping in a bit late here, but for Windows users who
aren't using Emacs, a very nice diff utility is Beyond Compare. It's
shareware (see www.scootersoftware.com), but cheap ($30) and very
good.

I've defined a bash script in Cygwin to run BC on my working copy,
comparing it to the repository, and it does a great job. The script
is really simple:

>#!/bin/sh
>svn cat $* >.repos
>until [ $# -le 1 ]
>do
> shift
>done
>"/cygdrive/F/Program files/Beyond Compare 2/BC2.exe" .repos $1
>rm .repos

and it gets BC to do a side-by-side colorized comparison of the two
files, showing me all the changes I've made, as a check before I
commit. BC can do lots of other comparison operations too.

Duncan Murdoch

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 3 02:45:38 2004

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