[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Error with svn diff

From: Tony Butt <Tony.Butt_at_cea.com.au>
Date: Fri, 15 Apr 2011 16:06:40 +1000

We are using Subversion 1.6.16 on a Ubuntu Lucid box, and a Ubuntu Hardy
(8.04) box hosting a subversion 1.6.16 repository via apache.

We use this configuration to support codestriker 1.9.10 for code
reviews, and have recently hit a problem with some of our reviews. After
carefully stepping through the codestriker code with some of our
affected source code, I found a problem with svn diff

The codestriker code checks the summary of lines changed at the top of
each diff block against the actual lines in the block, and rejects the
diff as malformed if they do not match.

On a particular piece of code, the svn diff header claims 33 old lines,
when there are actually 32.

I have re-run this with an external diff command
(svn diff -r 57968:57969 --old <somepath> --diff-cmd=/usr/bin/diff > out.diff)

and the problem goes away.

I reverted my subversion installation to 1.6.6, and the problem is still present.

I am loathe to post the diff, as the project is somewhat sensitive - we
build systems for defence here.

Finally, I am away on leave for a week, so cannot reply until after 26th

Tony Butt <Tony.Butt_at_cea.com.au>
CEA Technologies
Received on 2011-04-15 08:09:08 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.