CODEWITHSUNDEEP
svnwhitespaceeol
user420095
user420095

Reputation:

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

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?

Upvotes: 39

Views: 21800

Answers (2)

A.H.
A.H.

Reputation: 66243

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.

Upvotes: 58

pmod
pmod

Reputation: 10997

You can use external differencing tool with appropriate options (diff-cmd option in SVN config). Check this. Then you have freedom to set any diff tool and provide arguments to it. You can also use it directly:

svn diff --diff-cmd /usr/bin/diff --extensions "-b" -r 1143:1177 somefile

where -b to ignore white space at line end and consider all other sequences of one or more white space characters to be equivalent,

Upvotes: 3

Related Questions