[Monotone-devel] Re: Blob o' thoughts on converging edges

[graydon hoare]

On Sun, 25 Jul 2004 02:39:53 -0700, Nathaniel Smith <address@hidden> wrote:

> Conclusion: the edge labeled propagate1 must _also_ be
> annotated with rename(x, y), as if the rename happened again there.

you'll notice on commands.cc:606, we already do that. or at least
I thought we did..

> This causes (*) to be satisfied, and makes this merge work.
> Calculating this could be tricky, though; if, say, someone else
> renamed x to y on the [B, C] edge, then we would need to _not_
> annotate this on the [C, F] edge.

yeah. I investigated this in much more detial last night, and there
were actually a ton of bugs in this department. monotone has just been
very good at hiding them from me so far, quite accidentally. it took
the longest amount of time to come up with a test which actually showed
the bugs.

anyways, committed some fixes to this. unfortunately they can't
retroactively fix any renames you've already issued. I guess that's
why it still says "alpha software" on the box. :(

-graydon