umar
umar

Reputation: 4379

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 those lines that actually change in a significant way and not just in whitespace?

Upvotes: 96

Views: 57345

Answers (4)

jrbjazz
jrbjazz

Reputation: 3150

You can use

svn diff -r 100:200 -x -b > file.diff

If you want to ignore all whitespaces:

svn diff -x -w | less

Source

Upvotes: 98

zzxyz
zzxyz

Reputation: 2981

Note that end-of-lines are not considered whitespace in this scenario and that has to be ignored with:

svn diff -x --ignore-eol-style [etc...]

Upvotes: 8

tschaible
tschaible

Reputation: 7695

You can use an alternate diff command using the --diff-cmd argument for svn diff. diff is a good utility that has plenty of features for ignoring whitespace.

For example:

svn diff --diff-cmd /usr/bin/diff -x "-w"

Upvotes: 9

ur.
ur.

Reputation: 2957

Use -x --ignore-space-change or -x --ignore-all-space. (See svn -h diff.)

Upvotes: 75

Related Questions