using an external diff

[Alex Goldsmith <al...@rsp.com.au>]

Dear Subversion Dev,

I know this topic appears from time to time, with various ideas flowing 
around, but I am not sure how they apply to my current situation.

The example scenario:
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.

I am not really sure on how subversion merges projects, if it possible 
to do this kind of thing on the client side with the 'diff' and 'diff3' 
switches, or if I need to implement my own core algorithm as discussed 
in http://svn.haxx.se/dev/archive-2004-07/1175.shtml.

Can anyone provide any information either way? I just need to know which 
groove to follow.
Thanks for your help, Alex

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: using an external diff

["C. Michael Pilato" <cm...@collab.net>]

Ben Collins-Sussman wrote:
> On 12/14/06, Alex Goldsmith <al...@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 <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Re: using an external diff

[Ben Collins-Sussman <su...@red-bean.com>]

On 12/14/06, Alex Goldsmith <al...@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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org