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

Re: Using an external diff program with Subversion

From: Oliver Dain <odain_at_ll.mit.edu>
Date: 2003-08-12 16:05:33 CEST

Thanks for the reply. Its not entirely clear what the status of the 2
proposed patches mentioned in your email are. One looks like it
requires you to pass all options via -x which, in my opinion, seems less
useful than replaceable parameters.

I think replaceable parameters are much nicer than requiring a wrapper
script. Its easier to set up but still allows you to use a wrapper if
you want to do something really funky. For example, at my site I set up
a wrapper to call my diff program of choice. A college liked my
solution and wanted to use it but it had to be set up quite differently
on his machine as paths, etc. were different in his environment. If I
had been able to do it with just replaceable parameters it would have
taken me less time to do and he would have been able to simply copy my
cofig file and be up and running.

Robert Spier wrote:

>There is a ticket open for this issue. Or two.
>
> #1390
> http://subversion.tigris.org/issues/show_bug.cgi?id=1390
> #1388
> http://subversion.tigris.org/issues/show_bug.cgi?id=1388
>
>The discussion tapered off -- but there was no consensus as to whether
>to go with options or a wrapper script. I think wrapper scripts are
>probably a better idea, because you may want to use multiple diff
>programs.
>
>
>At 09 Aug 2003 10:34:30 -0400,
>Oliver Dain wrote:
>
>
>>Thanks to all for the replies. I certainly could (and will) do the
>>wrapper thing. I'd think it'd be a nice feature if, in the config, one
>>could specify something like:
>>
>>diff-cmd = /path/to/diff/program %f1 %f2 -L %N1 -L %N2
>>
>>where the %x's get expanded to something useful (like %f1 = first
>>filename, %f2 = 2nd file name, %N1 = nice name of file one (the name
>>with the revision number), etc. That way you could easily support ALL
>>diff programs and users wouldn't have to write custom wrappers for each
>>diff program they want to use. Has anybody else suggested this?
>>
>>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 12 17:30:44 2003

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