[Monotone-devel] Why my tree currently is unmergable

[Tom Koelman]

Hi,

my monotone tree currently has gotten into an unmergable state and I
figured out how to get in that state. To reproduce, run the attached
shell script in an empty directory and it will end up with a database
that won't merge.

What it does is this:

It creates a branch containing two files, A and B. It then creates two
children of the main revision.
- One child drops B and commits.
- The other child edits a, drops B, commits, disapproves, and commits
  again

If you now try to merge, monotone says:

monotone: fatal: std::logic_error: change_set.cc:487: invariant 'I(j != 
deltas.end())' 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

How could I get my tree to merge again?

Regards,
Tom Koelman

monotone 0.19 (base revision: ac4b3dd3c60eb95aa18e01d0f525a5dcfa85567c)
Running on: Windows NT/2000/XP (5.0, build 2195) on ia32 (level 15, rev 519)
Changes since base revision:

new_manifest [6aa680c77dc02652f1b969174faece55a94ee60a]

old_revision [ac4b3dd3c60eb95aa18e01d0f525a5dcfa85567c]
old_manifest [6aa680c77dc02652f1b969174faece55a94ee60a]


  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.

mt-test.sh
Description: Bourne shell script