svn diff

[prev] [thread] [next] [lurker] [Date index for 2005/09/06]

From: Nicholas Clark
Subject: svn diff
Date: 11:43 on 06 Sep 2005
So, I have a subversion checkout with some local changes. I think that they
are just whitespace. Obviously the regular svn diff shows me lots of noise,
but, hey, diff has an option to ignore whitespace, so surely svn diff can
too...

Its help says

...
Valid options:
...
  -x [--extensions] arg    : pass ARG as bundled options to GNU diff


And gnu diff says that -b is the option I want

so, let's see:

$ svn diff -x -b
svn: '-b' is not supported
$ svn diff -x b
svn: 'b' is not supported
$ svn diff -x --ignore-space-change
svn: '--ignore-space-change' is not supported
$ svn diff -x ignore-space-change
svn: 'ignore-space-change' is not supported
$ svn diff -x=-b
svn: '=-b' is not supported
$ svn diff -x -- -b
svn: invalid option character: b
Type 'svn help' for usage.

ggr. hateful dysfunctional thing. What's the point of telling me about
something that doesn't work. Even perforce can manage this whitespace trick.


Finally, a solution. Abuse one of the other hateful side effects of a svn
checkout:

$ diff -b lib/Vx/SOAP/DataStore/Storage.pm lib/Vx/SOAP/DataStore/.svn/text-base/Storage.pm.svn-base 
$

Yes. Just whitespace.

Dear svn, why can't you tell me that?

Nicholas Clark

Generated at 05:00 on 07 Sep 2005 by mariachi 0.52