[Monotone-devel] weird monotone behavior

[Hugo Cornelis]

Hi,


I have a weird problem with monotone.  It is reporting two heads, but
inspecting the log reveals that there is only one head:

address@hidden:~/neurospaces_project/userdocs/source/snapshots/0$
mtn update
mtn: updating along branch '0'
mtn: note: branch '0' has multiple heads
mtn: note: perhaps consider 'mtn merge'
mtn: already up to date at 4fc7ce895798eec6c510ec8b7e99038a58867051
address@hidden:~/neurospaces_project/userdocs/source/snapshots/0$
mtn merge
mtn: 2 heads on branch '0'
mtn: merge 1 / 1:
mtn: calculating best pair of heads to merge next
mtn: [left]  4fc7ce895798eec6c510ec8b7e99038a58867051
mtn: [right] c91be8d721885cc30be71bb73604fc385113d610
mtn: fatal: error: roster.cc:2086:
I(right_uncommon_ancestors.find(right_rid) !=
right_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/cornelis/neurospaces_project/userdocs/source/snapshots/0/_MTN/debug
mtn: if reporting a bug, please include this file


address@hidden:~/neurospaces_project/userdocs/source/snapshots/0$
mtn automate heads
4fc7ce895798eec6c510ec8b7e99038a58867051
c91be8d721885cc30be71bb73604fc385113d610


address@hidden:~/neurospaces_project/userdocs/source/snapshots/0$
mtn log --last 5
o   -----------------------------------------------------------------
|   Revision: 4fc7ce895798eec6c510ec8b7e99038a58867051
|   Ancestor: a0b433e7a2969267428616a983492bdd351b2ca9
|   Author: address@hidden
|   Date: 12/11/2010 11:23:41 AM
|   Branch: 0
|
|   Modified files:
|           genesis-add-object-solver/genesis-add-object-solver.tex
|
|   ChangeLog:
|
|   1. Updated genesis-add-object-solver.
o   -----------------------------------------------------------------
|   Revision: a0b433e7a2969267428616a983492bdd351b2ca9
|   Ancestor: 431dc3c6e00ef2af776e41e7ebd9b06e9862b4c0
|   Author: address@hidden
|   Date: 12/11/2010 11:06:40 AM
|   Branch: 0
|
|   Modified files:
|           cbi-architecture/cbi-architecture.tex
|
|   ChangeLog:
|
|   1. Updated cbi-architecture.
o   -----------------------------------------------------------------
|   Revision: 431dc3c6e00ef2af776e41e7ebd9b06e9862b4c0
|   Ancestor: c506949957a92bb911811364d3178736cec6d2f5
|   Author: address@hidden
|   Date: 12/11/2010 11:06:22 AM
|   Branch: 0
|
|   Modified files:
|           genesis-extend-functionality/genesis-extend-functionality.tex
|
|   ChangeLog:
|
|   1. Updated genesis-extend-functionality.
o   -----------------------------------------------------------------
|   Revision: c506949957a92bb911811364d3178736cec6d2f5
|   Ancestor: c91be8d721885cc30be71bb73604fc385113d610
|   Author: address@hidden
|   Date: 12/11/2010 11:00:07 AM
|   Branch: 0
|
|   Modified files:
|           ssp-example/ssp-example.tex
|
|   ChangeLog:
|
|   1. Updated ssp-example.
o     -----------------------------------------------------------------
|\    Revision: c91be8d721885cc30be71bb73604fc385113d610
| |   Ancestor: 0587b777eda758684147c28ec8e981673b80d5c3
| |   Ancestor: b2e1b68b861b72554cb47cbc8db518258f0206b6
| |   Author: address@hidden
| |   Author: address@hidden
| |   Date: 12/10/2010 10:19:12 PM
| |   Date: 12/11/2010 09:00:26 AM
| |   Branch: 0
| |   Branch: 0
| |
| |   Modified files:
| |           cbi-architecture/cbi-architecture.tex
| |           system-administration-log/system-administration-log.tex
| |
| |   ChangeLog:
| |
| |   merge of '0587b777eda758684147c28ec8e981673b80d5c3'
| |        and 'b2e1b68b861b72554cb47cbc8db518258f0206b6'
| |
| |   ChangeLog:
| |
| |   merge of '0587b777eda758684147c28ec8e981673b80d5c3'
| |        and 'b2e1b68b861b72554cb47cbc8db518258f0206b6'


address@hidden:~/neurospaces_project/userdocs/source/snapshots/0$
mtn version --full
monotone 0.47 (base revision: 58eca89fab6322a14c219fb377eae54e21311986)
Running on          : Linux 2.6.35-23-generic-pae #41-Ubuntu SMP Wed
Nov 24 10:35:46 UTC 2010 i686
C++ compiler        : GNU C++ version 4.4.5 20100813 (Linaro
prerelease) [release 2010.08-0]
C++ standard library: GNU libstdc++ version 20100813
Boost version       : 1_42
SQLite version      : 3.7.2 (compiled against 3.7.0.1)
Lua version         : Lua 5.1
PCRE version        : 8.02 2010-03-19 (compiled against 8.2)
Botan version       : 1.8.8 (compiled against 1.8.8)
Changes since base revision:
format_version "1"

new_manifest [69563b5f6cb9e1af6a87aebd6d672e721f646026]

old_revision [58eca89fab6322a14c219fb377eae54e21311986]

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


I am not sure what to do.  Help appreciated.

Thanks,


-- 
Hugo


--

                    Hugo Cornelis Ph.D.

              Neurospaces Project Architect
                http://www.neurospaces.org/

       Laboratory of Neuro- and Psychophysiology
              O&N I Herestraat 49 - bus 1021
                    3000 Leuven, Belgium

                  Research Imaging Institute
   University of Texas Health Science Center at San Antonio
                    7703 Floyd Curl Drive
                 San Antonio, TX  78284-6240

                    Phone: 210 567 8112
                      Fax: 210 567 8152

debug
Description: Binary data