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

Re: 3 way merge algorithm

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2004-04-29 05:50:19 CEST

On Wed, 2004-04-28 at 07:19, Torsten Rueger wrote:
> I'd really like to hear if anyone is interested in this, even quite
> separate from wanting to implement it.

I'm interested. I can't guarantee that I'll put time into it, but I'd
at least like to be able to stash an algorithm description somewhere for
the future. So, if you could write something up in more detail, I'd
appreciate it. Also, if you can't release code, it can be tough to be
sure that one is implementing the algorithm correctly.

Based on your description (which I could not totally understand), I'm
concerned that the algorithm may have O(n) memory requirements for
n-byte inputs. We need our diff algorithm to be able to operate
streamily, reading only sequential chunks of the inputs into memory at
one time.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 29 05:50:40 2004

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

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