How can I ignore eol changes and all white space in svn?

svn whitespace eol
user420095 picture user420095 · Sep 16, 2011 · Viewed 19.9k times · Source

Combining svn diff --ignore-eol-style and --ignore-all-space is not working:

$ svn diff -x -w --ignore-eol-style -r 1143:1177 somefile
svn: invalid option: --ignore-eol-style

And,

$ svn diff -x --ignore-eol-style -x --ignore-all-space -r 1143:1177 somefile

Only executes the last option: ignore-all-space

Anybody dealt with this before?

Answer

A.H. picture A.H. · Sep 17, 2011

The svn command seems to honour only one -x option. This means, you must/can combine all options into one argument:

    svn diff -x "-w --ignore-eol-style"

I did not test whether this is also true for external diff-tools.

Related questions

how to make svn diff show only non-whitespace line changes between two revisions

I can get diffs between two revisions using something like svn diff -r 100:200 > file.diff But the problem is that there are many lines that show up due to change in whitespace. Is there a way to only write …

Read More
Can CVS and Subversion be set to ignore whitespace in merging?

CVS and Subversion both have a handy merge feature so that when you update a source file that you have modified, it merges in changes that others have made on the same file. However, if your changes and the other …

Read More
Why is Git better than Subversion?

I've been using Subversion for a few years and after using SourceSafe, I just love Subversion. Combined with TortoiseSVN, I can't really imagine how it could be any better. Yet there's a growing number of developers claiming that Subversion has …

Read More