Nathaniel Smith wrote:
To expand: I'll assume everyone knows about the criss-cross merge
case, which forces us to choose more distant ancestors in some cases,
or else risk silently corrupting code.
I don't. Is there a reference?
(This problem seems specific to the semantics of rename; there
On Mon, May 02, 2005 at 01:57:51PM -0700, K. Richard Pixley wrote:
Nathaniel Smith wrote:
To expand: I'll assume everyone knows about the criss-cross merge
case, which forces us to choose more distant ancestors in some cases,
or else risk silently corrupting code.
I don't. Is there a
On Wed, Apr 27, 2005 at 03:54:14AM -0700, Nathaniel Smith wrote:
For merging, monotone does _not_ use the closest common ancestor. The
reason is that doing so could silently corrupt your code.
The simplest example is the famous criss-cross merge:
The last few days I've been thinking more
