Re: 3-way merge considered harmful (was Re: [Monotone-devel] merge weirdness...)

[Joel Reed]

On Mon, May 02, 2005 at 03:24:54PM -0700, Nathaniel Smith wrote:

snip

> Note you can do it for tree rearrangements too; treat each file as
> having a single-line chunk of data, containing its name, and a pointer
> to its parent directory.  The tricky part about this in the monotone
> case is figuring out which files in the left and right tree actually
> have the same logical identity.

would it be possible to switch monotone to git's model of storing
complete file copies rather than delta's? wouldn't this would fix 
the above problem?

jr