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

[Christof Petig]

Any idea on how to merge the changes in mainline (propagated to
nvm.cvssync.win32) into net.venge.monotone.cvssync?

When doing an explicit merge:

mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
0772ad08e5a0c6593219fb22e077929e36afc044
76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync

and resolving the first two conflicting files by hand (select third
wherever necessary) I get this error. Since I did not mess with file
renaming ... (perhaps the fact that I added/changed a file to/in the now
removed netxx/ directory is the problem? *)

Since I really want to finish my work on cvssync I'm somewhat stuck with
this error. Any hints on how to get this merge done (besides creating a
patch, applying by hand and never ever try to merge the heads again :-( )

Yours
   Christof

*) 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.

signature.asc
Description: OpenPGP digital signature