On Fri, 25 Feb 2005 19:27:30 -0500, Doug Way <dway at mailcan.com> wrote:

> Envy actually has no automatic merging capability whatsoever.  Which is
> odd, since you have fine-grained versioning (down to the method level)
> in Envy, so it wouldn't have been hard to write an Envy tool which would
> at least do a 3-way merge on a class and merge the non-conflicting
> methods for you.  You wouldn't need a text-based merge algorithm for
> that.  I think the Envy designers just never thought to add merge
> capability.

What's missing from Envy to have a really nice merge mechanism is the
ability to record multiple ancestor versions for a single method or
class version.  That's what we're doing in MC2.

Avi