Re: The new Codeville merge algorithm

On Thu, May 05, 2005 at 10:20:38AM -0700, Bram Cohen wrote:
> I've been discussing the Codeville merge algorithm with a few people on
> #revctrl recently, most notably Nathaniel Smith from Monotone and Ross,
> who does most of the real work on Codeville.

Some useful context for this may be two recent messages on
monotone-devel, where I lay out the known flaws in 3-way merge, and
why I no longer believe it is an acceptable approach to merging in any
but very restricted cases:
  http://article.gmane.org/gmane.comp.version-control.monotone.devel/3256
  http://article.gmane.org/gmane.comp.version-control.monotone.devel/3264
Full thread:
  http://thread.gmane.org/gmane.comp.version-control.monotone.devel/3240

The general problems and conclusions aren't specific to monotone at
all.

-- Nathaniel

-- 
- Don't let your informants burn anything.
- Don't grow old.
- Be good grad students.
  -- advice of Murray B. Emeneau on the occasion of his 100th birthday