[Monotone-devel] invariant failure on merge

[Neil Conway]

I'm getting an invariant failure attempting to merge the heads of a
branch in 0.15. emacs is invoked to resolve a merge conflict, but AFAICS
that completes successfully (I've done this a few times now and continue
to hit the invariant failure after qutting emacs). The last hundred
lines of "mt --debug merge" follow. I'd be happy to provide more
information, just let me know what.

-Neil

monotone: db.fetch("SELECT delta FROM 'file_deltas' WHERE id =
'cb11aa0e4ac00ad7147f143b35d607af962f74a2' AND base =
'c7eb9e293a8e5363012f0045498b57c1ad582542'")
monotone: calculating left edit script on 202 -> 211 lines
monotone: calculating right edit script on 202 -> 204 lines
monotone: calculating left extents on 9 edits
monotone: calculating right extents on 2 edits
monotone: normalizing 202 right extents
monotone: normalizing 202 left extents
monotone: merging 202 left, 202 right extents
monotone: conflicting edits: [changed 198 9] vs. [changed 197 3]
monotone: conflict detected. no merge.
/usr/bin/xemacs
executing external 3-way merge command: xemacs -no-init-file -eval
'(ediff-merge-files-with-ancestor "/tmp/mt.8Yld1u" "/tmp/mt.6PvXOa"
"/tmp/mt.eSHrVP" nil "/tmp/mt.CkoYIv")'
monotone: lua merge3 hook merged ok
monotone: recording successful merge of
c7eb9e293a8e5363012f0045498b57c1ad582542 <->
cb11aa0e4ac00ad7147f143b35d607af962f74a2 into
c7eb9e293a8e5363012f0045498b57c1ad582542
monotone: db.fetch("SELECT id FROM 'file_deltas' WHERE id =
'c7eb9e293a8e5363012f0045498b57c1ad582542'")
monotone: db.fetch("SELECT id FROM 'files' WHERE id =
'c7eb9e293a8e5363012f0045498b57c1ad582542'")
monotone: skipping delta to existing file version
c7eb9e293a8e5363012f0045498b57c1ad582542
monotone: merge of 'todo/todo.tex' :
'1e5229a8db9a63a6d6ba0ac0eb1cc0ca83307142' ->
'c7eb9e293a8e5363012f0045498b57c1ad582542' vs
'cb11aa0e4ac00ad7147f143b35d607af962f74a2' resolved to
'c7eb9e293a8e5363012f0045498b57c1ad582542'
monotone: resolved merge to 'todo/todo.tex' :
'1e5229a8db9a63a6d6ba0ac0eb1cc0ca83307142' ->
'c7eb9e293a8e5363012f0045498b57c1ad582542'
monotone: merging delta 'todo/todo_packages.txt' : '' ->
'43a011f3882de0d915bc1de61c2b6642b54a24ae' vs.
'bd6ad1c9b246f6117472deb278497a5fc1c83725'
monotone: trying to merge 43a011f3882de0d915bc1de61c2b6642b54a24ae <->
bd6ad1c9b246f6117472deb278497a5fc1c83725 (ancestor: )
monotone: db.fetch("SELECT id FROM 'files' WHERE id =
'43a011f3882de0d915bc1de61c2b6642b54a24ae'")
monotone: reconstructing 43a011f3882de0d915bc1de61c2b6642b54a24ae in
file_deltas
monotone: db.fetch("SELECT id FROM 'file_deltas' WHERE id =
'43a011f3882de0d915bc1de61c2b6642b54a24ae'")
monotone: db.fetch("SELECT id FROM 'files' WHERE id =
'43a011f3882de0d915bc1de61c2b6642b54a24ae'")
monotone: db.fetch("SELECT base from 'file_deltas' WHERE id =
'43a011f3882de0d915bc1de61c2b6642b54a24ae'")
monotone: inserting edge: 43a011f3882de0d915bc1de61c2b6642b54a24ae <-
bd6ad1c9b246f6117472deb278497a5fc1c83725
monotone: db.fetch("SELECT id FROM 'files' WHERE id =
'bd6ad1c9b246f6117472deb278497a5fc1c83725'")
monotone: db.fetch("SELECT data FROM 'files' WHERE id =
'bd6ad1c9b246f6117472deb278497a5fc1c83725'")
monotone: following delta bd6ad1c9b246f6117472deb278497a5fc1c83725 ->
43a011f3882de0d915bc1de61c2b6642b54a24ae
monotone: db.fetch("SELECT delta FROM 'file_deltas' WHERE id =
'43a011f3882de0d915bc1de61c2b6642b54a24ae' AND base =
'bd6ad1c9b246f6117472deb278497a5fc1c83725'")
monotone: database.cc:769: invariant 'I(ident() != "")' violated
monotone: db.execute("ROLLBACK")
monotone: discarding debug log
monotone: fatal: std::logic_error: database.cc:769: invariant
'I(ident() != "")' violated