Re: [Monotone-devel] small rcs compatibility bug in rcs_import.cc

[Jon Bright]

David Lamkin wrote:
> Having fixed that I get the error shown below which I will investigate -
> any pointers gratefully accepted!
>
> monotone: phase 1 (version import) complete
> monotone: [branches: 425] [finished branches: 27] [finished edges: 2642]
> [versions: 340596] building branch com.metanate.clearswift.net34_10
> monotone: fatal: std::logic_error: change_set.cc:2514: invariant 'I
> (b.rearrangement.deleted_files.empty())' violated

This happens in the case that a file was added on a branch.  In this 
case, CVS produces something like:

------------
1.1
date    2000.04.17.00.07.40;    author sircus;  state dead;
branches
        1.1.2.1;
next    ;

1.1.2.1
date    2000.04.17.00.07.40;    author sircus;  state Exp;
branches;
next    1.1.2.2;
------------

monotone incorrectly generates a delete for the 1.1 revision, deleting 
something that was never there.  There appears to be code in 
rcs_import.cc:process_branch() for dealing with this (look for "mark 
this file as newly present", note the check against "dead"), but it's 
either not being called or not having the desired effect.  I've not yet 
had time to look into why this is - if you do, please let me know to 
avoid duplication of effort.

--
Jon Bright
Silicon Circus Ltd.
http://www.siliconcircus.com