[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: <kfogel_at_collab.net>
Date: 2004-04-29 19:59:15 CEST

Torsten Rueger <torsten.rueger@hiit.fi> writes:
> at the university I work, we have found a more efficient algorithm for
> 3 way merging. It's works better than diff3 especially in that it
> handles moves. So it can merge cases where one person moves a piece of
> text, while the other edits a subset of it. It also handles XML merges
> surprisingly well.
> Unfortunately I can not release code (which is ruby anyway), but I can
> describe the algorithm, which is quite simple, and help anyone who
> wants to implement it.
> I would suggest it could be used for cases where diff3 fails, so as
> not to rock the boat too much initially.

It's too bad that a university (of all things!) restricts you from
releasing code, and from contributing to other projects (as you
mentioned in a later mail) :-(. Sigh.

Do you know why they have this policy, if there's any chance of
changing it? Would it help if some of us sent letters saying how it
could make a real difference to our project if the restrictions were
lifted? I'd certainly be happy to do so, if you think it would.

By the way, the algorithm sounds, at first glance, like the one
described in


You probably have a lot to read already in your job, so sorry for
piling a new URL on your plate :-).


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 29 21:12:11 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.