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

Re: Automerge algorithm ...

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-06-07 19:05:10 CEST

On 6/7/06, Kevin Greiner <greinerk@gmail.com> wrote:
> On 6/6/06, Javier Ruiz <ruiz.javier@gmail.com> wrote:
> >
> >
> > In order to be proactive and address their questions about how the merge
> works I've been searching for the details on how it merges two files (say
> Java or Javascript files) but haven't been able to find this information.
> Does anyone know where I can find these details?
> This appears to be what you're looking for:
> http://subversion.tigris.org/variance-adjusted-patching.html

No it isn't, that's a theoretical way we could take advantage of merge
history when applying diffs, but svn doesn't actually do it now.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 7 19:15:45 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.