[Monotone-devel] monotone merge error

[Mando Rodriguez]

Hi all,

We recently had a merge error on one of our monotone repositories. Would 
just like some clarification as to whether this is a bug or maybe we're 
doing something wrong, such as leaving a flag out.

When attempting to perform a merge we get this :

/
mtn: 2 heads on branch '0'
mtn: merge 1 / 1:
mtn: calculating best pair of heads to merge next
mtn: [left]  1d8d9ecda9ed7bd5b34dfbb48d4ce0d61e071598
mtn: [right] 96c815a1768eb25e49bf74ba3d6e6236adefb30a
mtn: fatal: error: roster.cc:1826: 
I(left_uncommon_ancestors.find(left_rid) != left_uncommon_ancestors.end())
mtn: this is almost certainly a bug in monotone.
mtn: please send this error message, the output of 'mtn version --full',
mtn: and a description of what you were doing to address@hidden
mtn: wrote debugging log to 
/home/genesis/neurospaces_project/userdocs/source/snapshots/0/_MTN/debug
mtn: if reporting a bug, please include this file /

The output of 'mtn version --full' is:

/monotone 0.46 (base revision: unknown)
Running on          : Linux 2.6.18-164.10.1.el5 #1 SMP Thu Jan 7 
19:54:26 EST 2010 x86_64
C++ compiler        : GNU C++ version 4.3.2
C++ standard library: GNU libstdc++ version 20080905
Boost version       : 1_34_1
SQLite version      : 3.5.9 (compiled against 3.5.9)
Lua version         : Lua 5.1
PCRE version        : 7.6 2008-01-28 (compiled against 7.6)
Botan version       : 1.8.6 (compiled against 1.8.6)
Changes since base revision:
unknown

/
The debug output from _MTN is attached. The repository with the error is 
here in case anybody would like to download it to look at it:

http://repo-genesis3.cbi.utsa.edu/drop/userdocs_4-15-2010.mtn


Thanks,
-Mando

debug
Description: application/text