[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == c
|
From: |
Christof Petig |
|
Subject: |
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself |
|
Date: |
Thu, 25 Aug 2005 09:25:48 +0200 |
|
User-agent: |
Mozilla Thunderbird 1.0.6 (X11/20050818) |
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
dump3.bz2
Description: application/bzip
signature.asc
Description: OpenPGP digital signature
Re: [Monotone-devel] Explicit_merge fails with invariant 'I(cs_left == cs_right)' on monotone itself, Timothy Brownawell, 2005/08/25