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

Inconsistency between diff and svn diff

From: Giulio Troccoli <giulio.troccoli_at_uk.linedata.com>
Date: Tue, 29 Sep 2009 10:18:36 +0100

I came across this problem while using ViewVC, but I don't think it's a problem with ViewVC, and it mihgt not even be a problem with Subversion. It's just that I have different results using diff and svn diff and I don't understand why.

I have a text file, with the svn:mime-type property set to text/plain, which unfortutanely does not have a newline at the end (and maybe this is the problem).

Running the svn diff command

svn diff -c5867 http://<path>/zdiacb10.rwt

gives me the differences but ends with the message

\ No newline at end of file

(yes, with a heading \)

I have also use the svn cat command twice to get the file at revision 5866 and 5867 and the used the diff command like this

svn cat -r5866 http://<path>/zdiacb10.rwt > gt1
svn cat -r5867 http://<path>/zdiacb10.rwt > gt2
diff gt1 gt2

But the result was

Binary files gt1 and gt2 differ

Is it because of the missing newline at the end that diff thinks these are binay files? And is it because the svn:mime-type property is set that svn is able to actually give the differences?


Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-29 11:19:56 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.