2 heads on branch 'im.pidgin.pidgin' Encountered an error while musing upon the following: ../transforms.cc:88: detected general error, 'E(false)' violated merge 1 / 1: calculating best pair of heads to merge next [left] 8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258 [right] da989b76dd8d021004b552840e9ad62dfe970bd9 Encountered an error while musing upon the following: ../roster.cc:2078: detected internal error, 'I(left_uncommon_ancestors.find(left_rid) != left_uncommon_ancestors.end())' violated Current work set: 13 items ----- begin 'system_flavour' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:112) 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 ----- end 'system_flavour' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:112) ----- begin 'cmdline_string' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:126) 'mtn', 'merge' ----- end 'cmdline_string' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:126) ----- begin 'string(lc_all)' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:131) en_US.UTF-8 ----- end 'string(lc_all)' (in virtual void sanity::initialize(int, char**, const char*), at ../sanity.cc:131) ----- begin 'full_version_string' (in virtual void mtn_sanity::initialize(int, char**, const char*), at ../mtn-sanity.cc:32) 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] ----- end 'full_version_string' (in virtual void mtn_sanity::initialize(int, char**, const char*), at ../mtn-sanity.cc:32) ----- begin 'new_id' (in bool database::put_revision(const revision_id&, const revision_t&), at ../database.cc:2823) 79b5cdeaf8da44f7c5eb465843d6e80499fe3524 ----- end 'new_id' (in bool database::put_revision(const revision_id&, const revision_t&), at ../database.cc:2823) ----- begin 'rev' (in bool database::put_revision(const revision_id&, const revision_t&), at ../database.cc:2824) format_version "1" new_manifest [a99c6e854553d6c630605faa4e31f67252d3e770] old_revision [8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258] patch "COPYRIGHT" from [355cda7e11da1ae3df22e58aa12d47a68ce9772a] to [32d71e559b352bb0e6d459319a0439a9bdff18a9] patch "ChangeLog" from [a6bb4ec247905ed0e6a2d9118bb9c6d3d9646a27] to [b08c1f481c9b8d05b9d11acaeb40d0c558197d2f] patch "ChangeLog.API" from [aeaa49f1143187442db23d394344206ba021adef] to [7506e29b249f9ac031167def0f09de6b5bfb0cd3] patch "libpurple/account.c" from [d8b86378c4aeae32fabdcaf478e904ec4c844526] to [950ac1ab9a1d7557336d39b6542200633483cd2b] patch "libpurple/protocols/irc/cmds.c" from [7327306021dde8bc516064ed5b3390e776c7a7f4] to [2f4a5c0f076a40bcb288fb79c0f01a006a76910b] patch "libpurple/protocols/yahoo/libymsg.c" from [f559efc53c46efa0e9678a2e898cb0644fc902a5] to [6090714a7b0fb9c74656b7346d20c6be74c9176e] patch "libpurple/protocols/yahoo/yahoo_filexfer.c" from [31512c808e4059a39f28a3553fb51f4983670274] to [f114dd82da4415ffe27cbf3a6f90b86e8216ff3a] patch "po/sv.po" from [e34edb360bbd6b33c8ad9b1db1cd870f6272bb97] to [8d5757f08ca532329408ab9474b7d51e1369d873] old_revision [da989b76dd8d021004b552840e9ad62dfe970bd9] ----- end 'rev' (in bool database::put_revision(const revision_id&, const revision_t&), at ../database.cc:2824) ----- begin '*ros_writeable' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2982) root dir is NULL ----- end '*ros_writeable' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2982) ----- begin '*mm_writeable' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2983) ----- end '*mm_writeable' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2983) ----- begin 'roster_manifest_id' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2985) ----- end 'roster_manifest_id' (in void database::put_roster_for_revision(const revision_id&, const revision_t&), at ../database.cc:2985) ----- begin 'rev' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:525) format_version "1" new_manifest [a99c6e854553d6c630605faa4e31f67252d3e770] old_revision [8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258] patch "COPYRIGHT" from [355cda7e11da1ae3df22e58aa12d47a68ce9772a] to [32d71e559b352bb0e6d459319a0439a9bdff18a9] patch "ChangeLog" from [a6bb4ec247905ed0e6a2d9118bb9c6d3d9646a27] to [b08c1f481c9b8d05b9d11acaeb40d0c558197d2f] patch "ChangeLog.API" from [aeaa49f1143187442db23d394344206ba021adef] to [7506e29b249f9ac031167def0f09de6b5bfb0cd3] patch "libpurple/account.c" from [d8b86378c4aeae32fabdcaf478e904ec4c844526] to [950ac1ab9a1d7557336d39b6542200633483cd2b] patch "libpurple/protocols/irc/cmds.c" from [7327306021dde8bc516064ed5b3390e776c7a7f4] to [2f4a5c0f076a40bcb288fb79c0f01a006a76910b] patch "libpurple/protocols/yahoo/libymsg.c" from [f559efc53c46efa0e9678a2e898cb0644fc902a5] to [6090714a7b0fb9c74656b7346d20c6be74c9176e] patch "libpurple/protocols/yahoo/yahoo_filexfer.c" from [31512c808e4059a39f28a3553fb51f4983670274] to [f114dd82da4415ffe27cbf3a6f90b86e8216ff3a] patch "po/sv.po" from [e34edb360bbd6b33c8ad9b1db1cd870f6272bb97] to [8d5757f08ca532329408ab9474b7d51e1369d873] old_revision [da989b76dd8d021004b552840e9ad62dfe970bd9] ----- end 'rev' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:525) ----- begin 'new_rid' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:526) 79b5cdeaf8da44f7c5eb465843d6e80499fe3524 ----- end 'new_rid' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:526) ----- begin 'new_roster' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:527) root dir is NULL ----- end 'new_roster' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:527) ----- begin 'new_markings' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:528) ----- end 'new_markings' (in void make_roster_for_revision(database&, node_id_source&, const revision_t&, const revision_id&, roster_t&, marking_map&), at ../ancestry.cc:528)