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

[Christof Petig]

Christof Petig schrieb:
> Christof Petig schrieb:
> 
>>mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
>>0772ad08e5a0c6593219fb22e077929e36afc044
>>76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync
>>
>>*) This would lead to the conclusion that removing the added file
>>(md5sum) in netxx/ might solve my problem ... I'll try that later this week.
> 
> 
> No this didn't work out (rev bd4e24addb51ab9290fe300723e11988dfe43e30)
> and omitting the third argument to explicit merge did not work either
> (other than wasting 3 quarters of an hour resolving conflicts and having
> that work lost on crash)
> 
> MT/debug appended
>    Christof

Further experimentation showed that

monotone explicit_merge 2f9b810bc98cb5d788518797b0fab805f05964fa
616ec315888dd5b791999730cf6dcece1f4a3820
44ed8807bead656889fb5022f974e13a7169098c net.venge.monotone.cvssync

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.

I attach the (much smaller) dump. Further experimentation (inserting
steps after 44ed8807bead656889fb5022f974e13a7169098c) might narrow down
the failing path.
   Christof

dump4.bz2
Description: application/bzip

signature.asc
Description: OpenPGP digital signature