[Monotone-devel] mtn explicit_merge crashes when merging already merged nodes.

[Peter Todd]

Minor bug, looks more serious than it is.

Basically if you do an explicit_merge on two nodes that already have a
merged version an ugly worrying message pops up rather than a simple
"Already merged" error message.

One example:

address@hidden:/tmp/tt/tt$ mtn explicit_merge 350e 65d6 io.pkt.soft.tt
mtn: expanded selector '350e' -> 'i:350e'
mtn: expanding selection '350e'
mtn: expanded to '350ebdf5db60d20ae948639bf935a8bc305eb948'
mtn: expanded selector '65d6' -> 'i:65d6'
mtn: expanding selection '65d6'
mtn: expanded to '65d6bfda67692e1fe9b62ccb2985385346cc4c61'
mtn: [left]  350ebdf5db60d20ae948639bf935a8bc305eb948
mtn: [right] 65d6bfda67692e1fe9b62ccb2985385346cc4c61
mtn: fatal: std::logic_error: database.cc:1,950: invariant
'I(!revision_exists(new_id))' violated
mtn: this is almost certainly a bug in monotone.
mtn: please send this error message, the output of 'mtn --full-version',
mtn: and a description of what you were doing to
address@hidden
mtn: wrote debugging log to /tmp/tt/tt/_MTN/debug
mtn: if reporting a bug, please include this file
address@hidden:/tmp/tt/tt$ mtn --full-version
monotone 0.34 (base revision: 6ae6de16b31495a773ac3002505ad51f2e4a8616)
Running on          : Linux 2.6.18-4-686 #1 SMP Wed May 9 23:03:12 UTC
2007 i686
C++ compiler        : GNU C++ version 4.1.2 20061115 (prerelease)
(Debian 4.1.1-21)
C++ standard library: GNU libstdc++ version 20061115
Boost version       : 1_33_1
Changes since base revision:
format_version "1"

new_manifest [0c2f96e14d290841a5111d69ad03174c391776a4]

old_revision [6ae6de16b31495a773ac3002505ad51f2e4a8616]

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

-- 
http://petertodd.ca

signature.asc
Description: Digital signature