Question

I just ran into a conflict while working in SVN, and I find myself missing a bit of functionality from Mercurial. In Mercurial, I have vim -d set up as my diff tool. I’m wondering if there is a way to get SVN to work in a similar way? Something along the lines of:

$ svn resolve whatever.py 

Which would bring up vim (in diff mode), allow me to fix the file, and then do an svn resolved to clean up. I work exclusively in CLI (mostly over SSH), so graphical diff tools need not apply.

Does such a thing exist?

Update:
It is probably worth including where in the process I am. I’ve edited a file (whatever.py), saved it, and done an svn update where someone else has also changed the file. So my svn stat looks like so:

?      whatever.py.mine
?      whatever.py.r7822
?      whatever.py.r7908
C      whatever.py

Answer 1

Whenever I have a conflict from a svn update, I’m asked for a half dozen options, one of which is to edit the file in question. Perhaps you need a newer version of Subversion. I’m running 1.6.9.