Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’m having problems trying to setup an external diff program for svn on Mac OSX Lion.
I have both xxdiff and opendiff installed.
I add these lines to ~/.subversion/config:
diff-cmd = opendiff
diff3-cmd = opendiff
or
diff-cmd = /Applications/xxdiff.app/Contents/MacOS/xxdiff
diff3-cmd = /Applications/xxdiff.app/Contents/MacOS/xxdiff
But when I invoke svn, I get this error:
svn: /Users/tre11/.subversion/config:49: Option expected
How do I fix this problem?
There aren’t many diff utilities, aside from the GNU ones of course, that will take the parameters as given by svn (bbdiff is one of the few). You need to wrap the call in a shell script. It’s explained in the subversion docs.
Edit
Based on your comment that the default text diff is still being run, I think there’s an error in your .subversion/config file. That’s consistent with your error message. The most likely cause is a space at the beginning of the
diff-cmdline. Yes, subversion’s parser freaks out at spaces at the beginning of the line. I put a space at the beginning of mydiff-cmdline and got the same “Option expected” error.