[Monotone-devel] Yet another merging bug

[Justin Patrin]

I have gotten another merging bug. I've created a stripped DB for you
to test with. This is a *large* DB (37MB) so please only download it
if you are going to actually use it, I *am* on a cable mode.
http://oe.reversefold.com/oe.mergebug.db.bz2

address@hidden monotone merge                                  
                         /home/papercrane/oe/org.openembedded.dev
monotone: starting with revision 1 / 4
monotone: merging with revision 2 / 4
monotone: [source] 591ed5c1898aef2e926558ce887977e56835d8ed
monotone: [source] 8f9ea859fc4bba48f6e30c3109216cb34cb4b904
monotone: common ancestor 57e9a003ef1b60bff1ddf1afc3b365abefa402a7 found
monotone: trying 3-way merge
monotone: fatal: std::logic_error: revision.cc:185: invariant
'I(*changesets.find(old_id)->second == *old_to_child_changes_p)'
violated
monotone: 
monotone: this is almost certainly a bug in monotone.
monotone: please send this error message, the output of 'monotone
--full-version',
monotone: and a description of what you were doing to address@hidden
monotone: wrote debugging log to MT/debug
address@hidden monotone --full-version                         
                                                    
/home/papercrane/oe/org.openembedded.dev
monotone 0.20 (base revision: 44ed8807bead656889fb5022f974e13a7169098c)
Running on: Linux 2.6.11-gentoo-r11 #2 Tue Jul 5 15:24:35 PDT 2005 i686
Changes since base revision:

new_manifest [5ce921ee9229c7e7f2f07d77c67de1feee633351]

old_revision [44ed8807bead656889fb5022f974e13a7169098c]
old_manifest [5ce921ee9229c7e7f2f07d77c67de1feee633351]


  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.




-- 
Justin Patrin