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

Re: svn external diff with non-local file fails?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-25 05:16:31 CET

On Mar 24, 2005, at 9:52 PM, Jesse Barnum wrote:
>
> My expectation is that Subversion should copy the necessary revision
> into that temp folder, and then call my diff utility. Is that how it
> is intended to work?
>

I think you misunderstood what was meant when you were told to "write a
shell wrapper".

It's absolutely none of your business how Subversion works under the
hood, and you should absolutely not be poking around in the .svn/
directory, trying to second-guess what Subversion is doing. :-)

What we meant was: write a script which rearranges the arguments
normally passed to GNU diff into an order that can be passed to
FileMerge.

It's our fault: we should have documented this in the book, and
haven't. But if you look at the source code, Subversion is invoking
external diff programs like this:

    diff -u -L leftlabel -L rightlabel file1 file2

All you need to do is write a shell script to rearrange the incoming
args, and pass the ones you want to FileMerge. Subversion will take
care of providing file1 and file2 for you.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 05:19:11 2005

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