You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by Alan Conway <ac...@redhat.com> on 2007/01/04 22:44:54 UTC

SVN diff and whitespace.

There's some bad indenting in the Qpid codebase (C++ at any rate, see
http://cwiki.apache.org/qpid/cppstyleguide.html for guidelines.) A bulk
cleanup would be good but till someone does that that I don't want
people to be avoid cleaning up individual files for fear of ruining diff
output.

It's easy to get svn diff to ignore whitespace changes, just add this to
your .subversion/config (on unix, on windows you probably need cygwin
diff in place of /usr/bin):

### Set diff-cmd to the absolute path of your 'diff' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff implementation.
diff-cmd = /usr/bin/diff -b
### Set diff3-cmd to the absolute path of your 'diff3' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff3 implementation.
diff3-cmd = /usr/bin/diff3 -b
### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3'
###   program accepts the '--diff-program' option.
diff3-has-program-arg = true