t+1 - Latest Comments in How to use vimdiff as the subversion diff tool

Re: How to use vimdiff as the subversion diff tool

Suresh Iyer — Wed, 16 Nov 2016 03:27:42 -0000

The right side of the diff is the not the editable file but some temp file . Need help !!

Re: How to use vimdiff as the subversion diff tool

Matt Wilson — Thu, 22 Jan 2015 17:07:53 -0000

I ran into that problem plenty too! I created these two aliases in my ~/.bashrc file:

alias boringdiff='svn diff --diff-cmd=/usr/bin/diff'
alias prettydiff='svn diff --diff-cmd=$HOME/bin/diffwrap.sh'

Then I commented out the line in the .subversion/config file.

I hope that helps!

Re: How to use vimdiff as the subversion diff tool

jroelofs — Thu, 22 Jan 2015 16:58:49 -0000

Is there a way to make this automatically switch to the old spew-the-diff-to-the-terminal mode when piping or redirecting the output to a file? That'd be really nice for patch creation (rather than having to do `svn diff --diff-cmd=...` every time for that).

Re: How to use vimdiff as the subversion diff tool

Dilawar Singh — Wed, 16 Jul 2014 01:20:11 -0000

Thanks you man. It helped. All I want to add that inside ~/.subversion/config file character `~` is not expanded to $HOME. It is recommended to pass the full path of the script or to keep the script in $PATH.

Re: How to use vimdiff as the subversion diff tool

Matt Wilson — Sun, 22 Dec 2013 16:49:06 -0000

That's great! Glad it helped.

Re: How to use vimdiff as the subversion diff tool

Alexander Bird — Sat, 21 Dec 2013 15:03:10 -0000

Awesome! I was able to set it up without any hiccups, it works like a charm. Thanks!

Re: How to use vimdiff as the subversion diff tool

Matt Wilson — Mon, 27 May 2013 15:30:13 -0000

Glad to hear it helped!

Re: How to use vimdiff as the subversion diff tool

Frank Smith — Mon, 27 May 2013 15:24:36 -0000

Thanks man! I changed /usr/bin/vimdiff to /usr/bin/env vimdiff because I compiled vim locally.

Re: How to use vimdiff as the subversion diff tool

Matt Wilson — Mon, 03 Dec 2012 09:34:09 -0000

You're asking how to quit out of vim without having to close every single buffer, one by one?

I think you can use the :qall! thing to jump out quick. Not really sure about that. I have my F5 key mapped to :bd (buffer delete) so I just bang on F5 until I'm out.

Thanks for the feedback!

Re: How to use vimdiff as the subversion diff tool

Leandro Freitas — Mon, 03 Dec 2012 07:53:49 -0000

Nice post! One question: how can I stop viewing diff files without the need for ":qa" until the last file changed? Thanks.

Re: How to use vimdiff as the subversion diff tool

Matt Wilson — Sun, 16 Jan 2011 20:18:17 -0000

Wow -- nice work!

Re: How to use vimdiff as the subversion diff tool

Carlo — Sun, 16 Jan 2011 12:42:53 -0000

I've made an improved version of this wrapper script, which gives friendly names to the Vim buffers, and also makes Vim's syntax highlighting work (it breaks because the temporary files "svn diff" creates do not have the appropriate extension).
http://carlo-notes.blogspot...