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

Re: swd - SVN word diff (wdiff)

From: Chris Pickett <chris.pickett_at_mail.mcgill.ca>
Date: Sun, 29 Nov 2009 18:19:08 -0500

Daniel Shahaf wrote:
> Chris Pickett wrote on Sun, 29 Nov 2009 at 02:46 -0500:
>> Cross-posting to wdiff-bugs and SVN dev. It's primarily an enhancement
>> to wdiff, but I thought svn might have more resources. An `svn wdiff'
>> feature that mimics this would certainly be neat!
>
> Can you achieve this with 'svn diff --diff-cmd=wdiff' (probably with
> a wrapper script around wdiff)?

Yes, except getting 'svn wdiff' recognized probably requires wrapping
svn itself. (I didn't think of this, so thanks!) My scripts are just:

1) in .bashrc: alias swd='svn diff --diff-cmd wdiff-svn.sh'

2) wdiff-svn.sh: wdiff-colours.sh "$6" "$7"

3) wdiff-colours.sh: wdiff "$1" "$2" | awk -f /path/to/wdiff-colours.awk

4) wdiff-colours.awk: contains the primary output munging.

Like I said, it's really a wdiff fix, but it's been so useful to me that
I thought I'd post to svn dev.

Chris

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2425313

Please start new threads on the <dev_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <dev-subscribe_at_subversion.apache.org>.
Received on 2009-11-30 00:19:29 CET

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