Re: precise codeville-merge reference now available

Bram Cohen wrote:

> I worked out how to do add convergence to this code, but it turns out
> that there's a broken case. In the case where one side applies then
> un-applies a patch and another side just applies the patch, then
> according to convergence both applications should be the same, so the
> un-application should win. But by the rollback principle the side which
> did the un-application had net no change, so the side with the single
> patch application should win.

For those of you not in the know, 'convergence' is the feature where
applying a single identical change to two different branches has the same
effect as doing that change a single time within the system and then
merging that change into both of those branches.

-Bram