[Monotone-devel] Merge errors (0.48)

[Paul Aurich]

The Pidgin developers are having an issue similar to [0] [1] in our
database, where the main branch is purportedly unmerged, but we cannot
merge it:

$ mtn heads
mtn: branch 'im.pidgin.pidgin' is currently unmerged:
8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258 address@hidden
address@hidden 06/18/2010 13:14:04 06/18/2010 11:52:25
da989b76dd8d021004b552840e9ad62dfe970bd9 address@hidden 06/21/2010
22:30:36

$ mtn merge
mtn: 2 heads on branch 'im.pidgin.pidgin'
mtn: merge 1 / 1:
mtn: calculating best pair of heads to merge next
mtn: [left]  8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258
mtn: [right] da989b76dd8d021004b552840e9ad62dfe970bd9
mtn: fatal: error: ../roster.cc:2078:
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 /Users/paul/Sources/pidgin/_MTN/debug
mtn: if reporting a bug, please include this file

$ mtn version --full
monotone 0.48 (base revision: 844268c137aaa783aa800a9c16ae61edda80ecea)
Running on          : Darwin 10.4.0 Darwin Kernel Version 10.4.0: Fri
Apr 23 18:28:53 PDT 2010; root:xnu-1504.7.4~1/RELEASE_I386 i386
C++ compiler        : GNU C++ version 4.0.1 (Apple Inc. build 5493)
C++ standard library: GNU libstdc++ version 20050421
Boost version       : 1_40
SQLite version      : 3.6.11 (compiled against 3.6.11)
Lua version         : Lua 5.1
PCRE version        : 7.8 2008-09-05 (compiled against 7.8)
Botan version       : 1.8.1 (compiled against 1.8.1)
Changes since base revision:
format_version "1"

new_manifest [86bede3ba4251594f3a0f7e0c31560f9f8ce3744]

old_revision [844268c137aaa783aa800a9c16ae61edda80ecea]

I've attached the debug file generated.

Thanks,
~Paul


[0]
http://lists.nongnu.org/archive/html/monotone-devel/2010-04/msg00029.html
[1]
http://lists.nongnu.org/archive/html/monotone-devel/2010-05/msg00010.html (new
month)

debug
Description: Text document

signature.asc
Description: OpenPGP digital signature