Re: [cdv-devel] tree merging

Ross Cohen wrote:

> Consider how this maps to precise codeville merge. "foo", "bar" and "baz"
> are all unique lines. The last changed rev represents when the line was born
> or revived (it's a list since, unlike normal merging, we support convergence
> here). Also unlike normal merging, our conflict cases are fundamentally
> different. Our constraint is one and only line must exist at each point,
> there are no contextual issues as with contents.

I'm not entirely certain how to do precise merge on file names, by the
way. My other post gave some of the important cases, but there may be
cases which I wouldn't be sure how they should be handled, and I haven't
worked out how to algorithmically generate the right answers for all the
funny edge cases I have worked out.

As a result, there may be a future version of codeville which has perfect
magic implicit undo when you revert file contents, but doesn't behave
quite so well when you revert file names. If anybody would like to work
out all the subtle details of renames, that would be very helpful.

-Bram