[Monotone-devel] Updated Issue 86 - fatal `merge` error: I(right_uncommon_ancestors.find(right_rid) != right_uncommon_ancestors.end()) (monotone)

[code]

Hello,

The following issue has been updated:

86 - fatal `merge` error:  I(right_uncommon_ancestors.find(right_rid) != 
right_uncommon_ancestors.end())
Project: monotone
Status: New
Reported by: Douglas Dickinson
URL: http://code.monotone.ca/p/monotone/issues/86/
Labels:
 Type:Defect
 Priority:Medium

Comments (last first):

# By Douglas Dickinson, Oct  7, 2010:

> What does `mtn au get_revision
> 1bf1c99573748c3b51beabc91bbbaa9b39bc96fe` print?

$ mtn au get_revision 1bf1c99573748c3b51beabc91bbbaa9b39bc96fe
format_version "1"

new_manifest [ce8b79ac00bf432cbff130a27d86c7c0367ace7b]

old_revision [29b175db52cc213d24e21123fb7381f1763c1901]

patch "env/bashrc"
 from [7f49a269b79d77aa0ad34251f3a5f0d33314c26a]
   to [019ad922fd77f976cdfd8e94e2c85d427ba03e4a]

patch "env/setup-google.sh"
 from [feb5dd1df011f1859d8538e939d6d64a661f8b2c]
   to [1bbc2211d4d470b120ccb798c1fe59c2fc70fbbe]

patch "env/setup.sh"
 from [9fa58266ae12836cccf38f0bfb07ff2effa823ee]
   to [abbe35eadaaadb152d1af0628d3413b4744bda3b]

old_revision [2bedf3c8839ab8f6e501f6c21dd52f6915c83183]

add_dir "todo"

add_file "bin/todo.sh"
 content [2b8d615bcaaaebe50fc01ebfc8e47e36c02fed52]

add_file "todo/config"
 content [543fc050007349ab09147215b0f74ca731a98356]

add_file "todo/done.txt"
 content [da39a3ee5e6b4b0d3255bfef95601890afd80709]

add_file "todo/report.txt"
 content [da39a3ee5e6b4b0d3255bfef95601890afd80709]

add_file "todo/todo.tmp"
 content [da39a3ee5e6b4b0d3255bfef95601890afd80709]

add_file "todo/todo.txt"
 content [da39a3ee5e6b4b0d3255bfef95601890afd80709]

patch "env/setup.sh"
 from [085c143b04ec8488032789d9f20e53c602e8d0c2]
   to [abbe35eadaaadb152d1af0628d3413b4744bda3b]

  set "bin/todo.sh"
 attr "mtn:execute"
value "true"

# By Thomas Keller, Oct  7, 2010:

Hrm... interesting. The 2007 workspace bug is insofar similar as Nathaniel 
mentions the "no committed changes" merge problem in 
http://lists.nongnu.org/archive/html/monotone-devel/2007-10/msg00165.html for 
which the revision here in question also looks very suspicious:

format_version "1"

new_manifest [69932b4f4598082f8010d28d0d9ef4f349db34e8]

old_revision [01097bd9412a12c71a00c846d0ab31252dc0f9c2]

old_revision [1bf1c99573748c3b51beabc91bbbaa9b39bc96fe]

delete "todo/todo.tmp"

patch "env/setup.sh"
 from [abbe35eadaaadb152d1af0628d3413b4744bda3b]
   to [c1533dedd84fc37600d561eb6a72d279f949bdb5]
...

This looks like [1bf1c99573748c3b51beabc91bbbaa9b39bc96fe] has no recorded 
changes (or at least no changes which should be applied to 
[01097bd9412a12c71a00c846d0ab31252dc0f9c2] because the latter is an ancestor of 
the former)
and thus shouldn't even exist. What does `mtn au get_revision 
1bf1c99573748c3b51beabc91bbbaa9b39bc96fe` print?

Sorry for fishing a little in the dark here - others might be of more help...

# By Douglas Dickinson, Oct  6, 2010:

See shell log below, and attached _MTN/debug.
Is there anything else that I can provide to help tracking this down?

My next steps will be
* save copies of the workspace & database
* turn off inodeprints
* create a fresh DB on the same box, synced from a different host
* sync and see if the weirdness spreads to other hosts.
* try the latest 0.48

Searching for similar issues I found:
* bug #23349 closed in 0.45-2 as not reproducible
* and some older references:
http://lists.nongnu.org/archive/html/monotone-devel/2006-04/msg00020.html
http://lists.nongnu.org/archive/html/monotone-devel/2007-10/msg00155.html

#### Shell log:

$ mtn status
Current revision: 0062536569ea03ca240be11162c03e65698d74c5
Current branch: ddd.ds
Changes against parent 01097bd9412a12c71a00c846d0ab31252dc0f9c2
  no changes

$ mtn heads
mtn: branch 'ddd.ds' is currently unmerged:
01097bd9412a12c71a00c846d0ab31252dc0f9c2 address@hidden 10/04/2010 14:19:50
1bf1c99573748c3b51beabc91bbbaa9b39bc96fe address@hidden address@hidden 
10/04/2010 12:53:34 10/04/2010 12:54:17

$ mtn merge
mtn: 2 heads on branch 'ddd.ds'
enter passphrase for key ID address@hidden (cc46df37...):
mtn: merge 1 / 1:
mtn: calculating best pair of heads to merge next
mtn: [left]  01097bd9412a12c71a00c846d0ab31252dc0f9c2
mtn: [right] 1bf1c99573748c3b51beabc91bbbaa9b39bc96fe
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 /Users/douglasdd/ds/_MTN/debug
mtn: if reporting a bug, please include this file

$ mtn version --full
monotone 0.47 (base revision: 58eca89fab6322a14c219fb377eae54e21311986)
Running on          : Darwin 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 
16:55:01 PDT 2009; root:xnu-1228.15.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_42
SQLite version      : 3.6.23.1 (compiled against 3.6.23.1)
Lua version         : Lua 5.1
PCRE version        : 7.9 2009-04-11 (compiled against 7.9)
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.

$ uname -a 
Darwin douglasdd-macbookpro 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 
16:55:01 PDT 2009; root:xnu-1228.15.4~1/RELEASE_I386 i386
# ...aka Mac OS X 10.5.8

Attachments:
- debug - 6.50 kB
  http://code.monotone.ca/p/monotone/issues/view/attachment/14/debug




--
Issue: http://code.monotone.ca/p/monotone/issues/86/