Lojic Technologies Blog » subversion http://lojic.com/blog Fri, 25 Nov 2011 20:12:56 +0000 http://wordpress.org/?v=2.8.4 en hourly 1 Use vimdiff to display subversion diffs http://lojic.com/blog/2007/11/27/use-vimdiff-to-display-subversion-diffs/ http://lojic.com/blog/2007/11/27/use-vimdiff-to-display-subversion-diffs/#comments Tue, 27 Nov 2007 15:14:38 +0000 Brian Adkins http://lojic.com/blog/2007/11/27/use-vimdiff-to-display-subversion-diffs/ I prefer using vimdiff or gvimdiff to view differences between files. When researching ways to allow using vimdiff to view subversion differences, I came across this article.

The bottom line is that subversion passes the two relevant arguments as the 6th and 7th arguments, so the following shell script wrapper does the trick:

#!/bin/sh
/usr/bin/gvimdiff ${6} ${7}

Save the script as gvimdiff_wrapper.sh, make it executable and accessible on your path. Then modify $HOME/.subversion/config to have the following line:

diff-cmd = gvimdiff_wrapper.sh

That will allow you to use gvimdiff to display the diff generated by svn diff my_file.txt

]]> http://lojic.com/blog/2007/11/27/use-vimdiff-to-display-subversion-diffs/feed/ 3