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

Re: diff-cmd with binary files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-11-18 20:55:06 CET

On Tue, 2003-11-18 at 13:52, Jason Rust wrote:
> I'm trying to use an external diff command (gnu diff) when showing the diff between
> two binary files. The command I run:
> svn diff --diff-cmd /usr/bin/diff -r 878:879 logout.gif
> Results in this error:
> Binary files logout.gif (revision 878) and logout.gif (revision 879)
> differ
> svn: Error calling external program
> svn: '/usr/bin/diff' returned 2
> If I leave out the svn diff-cmd option I get:
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Is this user error or a bug in svn/diff?

Are you simply saying that the inconsistency is a bug?

If so, I agree. The --diff-cmd variant should behave the same as the
command that uses the internal diff. It's easy to fix.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 18 20:56:07 2003

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.