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

Re: Curious about SVN Merge: diff3 or patch?

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-08-19 23:02:25 CEST

On 8/15/06, Rob Hubbard <Rob.Hubbard@celoxica.com> wrote:
> Hello,
>
> I would like to understand better the "merge" process. In particular, I would like to know whether an svn merge is effectively a diff3, or a diff/patch process, or something else, more complex.

> The SVN documentation hints that the process is of the diff/patch-style:
> "But svn merge has special abilities that surpass the patch program."
> but I don't think it's stated definitively one way or the other.

Internally, svn update uses diff3, so does svn merge. We have diff4
code, but that's not hooked up (yet)...

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 19 23:03:40 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.