Re: [Monotone-devel] Re: 3-way merge considered harmful

[Nathaniel Smith]

On Wed, May 04, 2005 at 03:37:11PM -0700, K. Richard Pixley wrote:
>    Nathaniel Smith wrote:
> 
>  If you collapse all of the directories into an archive resembling a
>  normalized "ls -iR" [...]
> 
> 
>  Sure, you can write down a textual representation of this information.
>  manifests and change_set's more or less are such a representation.
> 
>  The problem isn't that it's impossible, it's that it doesn't actually
>  help solve any of the problems we need to solve, as far as I can tell.
> 
>    Ok.  Such as?

Well... umm... merging is kinda The Problem :-).

A representation like that could be used as a UI to describe conflicts
to the user and let them resolve them, but 1) it's probably not the
best UI for that, and 2) by the time you start worrying about conflict
presentation UI, you've already done the hard parts.

-- 
"Of course, the entire effort is to put oneself
 Outside the ordinary range
 Of what are called statistics."
  -- Stephan Spender