[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

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2006-12-15 16:25:15 CET

Ben Collins-Sussman wrote:
> On 12/14/06, Alex Goldsmith <alexg@rsp.com.au> wrote:
>
>> We have a few hundred independent projects with a significant amount
>> XML. It is important to be able to migrate changes between projects, and
>> it seems like this should be possible with an intelligent diff.
>
> The 'svn merge' command has a --diff3 switch, so you can make it use
> an external diff3 program, presumably one which understands XML.

(Actually, it's a --diff3-cmd switch.)

There's a catch, though. Subverion's external-diff and external-diff-3
interactions expect programs that accept the same arguments as, and
return the same errorcodes and output as, GNU diff and diff3. To use an
arbitrary external diff/diff3 tool, you almost certainly have to use
wrapper scripts which handle the feigning of those GNU calling conventions.

See
http://svnbook.red-bean.com/nightly/en/svn.advanced.externaldifftools.html
for more details.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Fri Dec 15 16:25:44 2006

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