Re: [Monotone-devel] Yet another merging bug

[Nathaniel Smith]

On Thu, Jul 21, 2005 at 08:48:58PM -0700, Justin Patrin wrote:
> monotone: [source] 591ed5c1898aef2e926558ce887977e56835d8ed
> monotone: [source] 8f9ea859fc4bba48f6e30c3109216cb34cb4b904
> monotone: common ancestor 57e9a003ef1b60bff1ddf1afc3b365abefa402a7 found
> monotone: trying 3-way merge
> monotone: fatal: std::logic_error: revision.cc:185: invariant
> 'I(*changesets.find(old_id)->second == *old_to_child_changes_p)'
> violated

This seems to be exactly the same problem as Michael Lauer's, in the
next thread over.  Using 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f as
the common ancestor seems to work fine.

-- Nathaniel

-- 
"But suppose I am not willing to claim that.  For in fact pianos
are heavy, and very few persons can carry a piano all by themselves."