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

Re: Patch command execution

From: Zack Weinberg <zack_at_codesourcery.com>
Date: 2002-02-08 02:49:37 CET

On Thu, Feb 07, 2002 at 05:09:52PM -0800, Greg Stein wrote:
> On Thu, Feb 07, 2002 at 04:53:14PM -0800, Zack Weinberg wrote:
> > On Thu, Feb 07, 2002 at 02:17:22PM -0600, Ben Collins-Sussman wrote:
> > > > Given the requirement that it only support the default diff format svn
> > > > generates,
> > >
> > > ...whoa there. SVN sends its own binary diff format over the *wire*
> > > only. During an update, this binary diff is used to recreate a new
> > > pristine fulltext in .svn/tmp/. Then we use diff/patch to perform a
> > > *context* merge into the user's existing local mods.
> >
> > I still don't understand why we use diff+patch to do this instead of a
> > real 3-way merge program (which has more information and therefore can
> > do a better job).
>
> The binary diffs do not have context.

I understand this.

> So we take the original text, apply the svndiff to get the new
> fulltext,

I don't understand why we don't stop at this point and feed all three
files to a genuine three-way merge algorithm.

zw

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006

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