RE: [viewvc-users] Diff of binary files

>


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

-----Original Message-----


> From: C. Michael Pilato [mailto:[email protected]]
> Sent: 08 October 2009 18:09
> To: Giulio Troccoli
> Cc: [email protected]
> Subject: Re: [viewvc-users] Diff of binary files
>
> Giulio Troccoli wrote:
> > I have a file that the system diff (/usr/bin/diff) thinks
> it's binary.
> > I guess it's because it doesn't have a newline at the end,
> but that's
> > irrelevant.
> >
> > I can use the -a option to get the differences in a unified fashion
> > but I can't seem to find a way to tell ViewVC to do so, so
> I can view
> > the differences inside ViewVC.
>
> Have you considered creating a wrapper script for 'diff' that
> adds the '-a'
> option, and configuring ViewVC to use that script instead of
> diff itself?
>

I have just tried that, but wiht no luck.

I wrote my_diff as

#!/bin/ksh
/usr/bin/diff -a $*

And then put this in viewvc.conf

diff = /usr/local/viewvc/my_diff

Although I didn't have the changes, the message has changed from "- Binary file revisions differ -" to "- No changes -".

I know that the file in question has some non-printable characters at the end (left-over from the previous CMS) but svn diff is able to show the differences (although with a final "No newline at end of file" message) and I would like ViewVC to be able to do the same.

------------------------------------------------------
http://viewvc.tigris.org/ds/viewMessage.do?dsForumId=4255&dsMessageId=2405442

To unsubscribe from this discussion, e-mail: [[email protected]].