[Monotone-devel] monotone repository inconsistent??

[Timothy Brownawell]

Concerning tests/t_merge_binary.at:
Revision f550 has a left ancestor db0b and a right ancestor f2ed, with a
common ancestor 734c3. (This is neither the lca (64c8) nor the lcad
(7f84).)
>From 734c3 to db0b, and from db0b to f550 there is no change.
>From 734c3 to f2ed, it is deleted, and from f2ed to f550 it is added.

734c3->db0b->f550 does not match 734c3->f2ed->f550, or
cs_left != cs_right

This also happens with this same file for f27d with left ancestor f2ed,
right ancestor 5c44 and common ancestor 5c44.



$ mtn automate ancestors $(mtn complete revision f550)|grep f2ed
f2ed4978d9f1601b9267f20d5d70d10a042a3788
$ mtn automate ancestors $(mtn complete revision f550)|grep ^db0b
db0b53e7f8a4900e9153f4c15643b37aaa3e8c16
$ mtn automate ancestors $(mtn complete revision db0b)|grep 734c3
734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
$ mtn automate ancestors $(mtn complete revision f2ed)|grep 734c3
734c39bb873f8fc83b8d54a7ad8e7a028864e4fc

$ mtn --quiet diff -r 734c3 -r db0b | grep '^#.*t_merge_binary'
$ mtn --quiet diff -r db0b -r f550 | grep '^#.*t_merge_binary'

$ mtn --quiet diff -r 734c3 -r f2ed | grep '^#.*t_merge_binary'
# delete_file "tests/t_merge_binary.at"
$ mtn --quiet diff -r f2ed -r f550 | grep '^#.*t_merge_binary'
# add_file "tests/t_merge_binary.at"
# patch "tests/t_merge_binary.at"



add_file "tests/t_merge_binary.at"
         |
         |
  +   734c3    +
   \   /  \   /
+   816d  d589    +
 \   /       \   /
  db0b       516c    +
   |            \   /
   |            154e    +
   |               \   /
   |         ______5c44_     +
   |        /-    /- || \   /
   |       /   09bf  || 0cf9
   |       |  /      ||
   |    ___f2ed_     ||
   |   /+  /||| \+  / |
   |  /   / |||  f27d |
  f550   /  /||+  /   |
   |    /  // 589e    |
   |   /+  ||         |
   6c00   / |        /
    \    /+ |       /
     a10c   |      /
        \  /+     /
        0254     /
            \   /+-
            bff0