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

Re: svn 1.4.5 bug with diff on binary files

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-08-29 18:13:22 CEST

On 8/28/07, Wade Carpenter <wade.carpenter@gmail.com> wrote:
> This seems to be related to 1019:
> http://subversion.tigris.org/issues/show_bug.cgi?id=1019
>
> I'm running svn client 1.4.5:
> svn --version
> svn, version 1.4.2 (r22196)
> compiled Jan 18 2007, 11:56:49

Uh, it says 1.4.2, not 1.4.5. :-)

>
> If I use svn internal diff, this problem is not present.
>
> For external diff, I set diff-cmd=/usr/bin/diff in my .subversion/config file.
> /usr/bin/diff --version
> diff (GNU diffutils) 2.8.1
>
> Example output:
> svn diff -r11827 subidr/
> Index: subidr/file.bin
> ===================================================================
> Binary files subidr/file.bin (revision 11827) and
> subidr/file.bin (working copy) differ
> ../svn_1.4.5/subversion/libsvn_subr/io.c:2230: (apr_err=200012)
> svn: '/usr/bin/diff' returned 2

Using the latest trunk code, and setting my diff-cmd runtime config
variable to '/usr/bin/diff' (which is also gnu diff 2.8.1), I can't
reproduce this problem:

$ svn diff win32.png
Index: win32.png
===================================================================
Cannot display: file marked as a binary type.

...though maybe something is up with your installation. The error
message is printing an error from your svn_1.4.5 libsvn_subr library,
while your 'svn --version' claims to be 1.4.2. Perhaps you've got
some odd linkage going on, a mixture of library versions?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 29 18:12:47 2007

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