Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself

[Nathaniel Smith]

On Thu, Aug 25, 2005 at 11:07:46AM +0200, Christof Petig wrote:
> fails while explicitely merging via
> 
> monotone explicit_merge e95be13d506eb955b465a30fe7ce192354018384
> 616ec315888dd5b791999730cf6dcece1f4a3820
> 44ed8807bead656889fb5022f974e13a7169098c net.venge.monotone.cvssync
> 
> monotone explicit_merge 2f9b810bc98cb5d788518797b0fab805f05964fa
> 4650fb7cb2230e5b5a47164fe082e1394f19066b
> e95be13d506eb955b465a30fe7ce192354018384 net.venge.monotone.cvssync
> 
> works. This seems to be related to your loop between
> e95be13d506eb955b465a30fe7ce192354018384 and
> 2f9b810bc98cb5d788518797b0fab805f05964fa.
> 
>   Further than that I have no clue but managed to work around it using
> several (see above) steps.

So you're currently okay?  If so, I wouldn't worry about it too much;
we know there are these annoying bugs in some of these complicated
merge topologies, and we know how we're going to solve them, just it
will take a little bit to implement...

-- 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."