Vim Tips Wiki
Advertisement

Use this page to discuss script 1797 svnvimdiff: svn diff + vimdiff

  • Add constructive comments, bug reports, or discuss improvements (see the guideline).
  • Do not document the script here (the author should do that on vim.org).
  • This page may be out of date: check the script's vim.org page above, and its release notes.

Patch for tempfile[]

The svnvimdiff script requires tempfile command. But it doesn't exist in my CentOS and FreeBSD system. So I modified the script:

#patch=`tempfile -p $suffix`
#orig=`tempfile -p $suffix`
patch=`mktemp -t $suffix.XXXXXXXXXX`
orig=`mktemp -t $suffix.XXXXXXXXXX`

Comments[]

Would the author please provide a short user guide on how to configure and use the script? I have copied the svnvimdiff file into my ~/bin/ directory and changed the diff-cmd variable in ~/.subversion/config to point at the script. Now when I call svn diff it cycles through all files in the SVN repository, but not through the conflicting files.

Advertisement