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

svnlook diff and binary files

From: Tim Shadel <tim_at_zserve.com>
Date: 2003-05-06 22:24:45 CEST

I'm using svn 0.20.0 (svn, version 0.20.0 (r5410)). I'm getting errors
in our commit emails when I add a binary file (though other file
operations may also cause the error).

This seems to be worthy of a fix before 1.0, especially since the
following discussion indicated that other diffs were omitted from the
commit emails. I like the output of 'svn diff' regarding binary files,
but 'svnlook diff' seems to break. We rely on those emails (though not
blindly) to keep us informed of what's going on. I believe this is an
important part of a 1.0 versioning product.

I've read the discussion here:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=25283&list=dev

but there wasn't a clear conclusion (besides the fact that a setting for
1 diff program per mime type is Post-1.0),

and the (not really) related:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=206389

We're using the commit-email.pl. Here's the error listed for the added
binary file:

Added: branch/my/binary/file.jar
==============================================================================
Files branch/my/binary/file.jar (original) and branch/my/binary/file.jar
differ
subversion/libsvn_subr/io.c:1198: (apr_err=200012)
svn: Error calling external program
svn: '/usr/bin/diff' returned 2

Here's some output from my diff command:

tim@svn tim $ diff -v
diff (GNU diffutils) 2.8.4
tim@svn tim $ echo $?
0
tim@svn tim $ /usr/bin/diff .svnlook/branch/my/binary/file.jar\(null\)
.svnlook/branch/my/binary/file.jar
Files .svnlook/branch/my/binary/file.jar(null) and
.svnlook/branch/my/binary/file.jar differ

tim@svn tim $ echo $?
2

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 6 22:28:11 2003

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

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