[Monotone-devel] update error

[Tom Tromey]

Tonight I re-fetched and ran update in my working tree.
I have a couple uncommitted change in the tree.

I got the appended error.

Tom

fleche. monotone update
selected update target 637f0664797d02d1d711b0bd98552ebf01abb12d
opening rcfile '/home/tromey/.monotonerc' ... ok
executing update command
db.execute("BEGIN")
db.fetch("SELECT version FROM schema_version")
manifest path is MT/manifest
loading manifest file MT/manifest
read 258 manifest entries
work path is MT/work
no un-committed work file MT/work
adding ancestry as final sort operator
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'YzI2MDhkMmRmYzdhYzg3OGQ1N2VhZDhmODg0NDFmMjI1Y2UxYjBjZg==
'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'MzBkZDQ2NmI1ZjhhYjNhZTkyNTI2Njg3YWYyYjc1NjRjOWQyMjlhZQ==
'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'NjM3ZjA2NjQ3OTdkMDJkMWQ3MTFiMGJkOTg1NTJlYmYwMWFiYjEyZA==
'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE id = '30dd466b5f8ab3ae92526687af2b7564c9d229ae' AND name = 'branch' AND 
value = 'bW9ub3RvbmU=
'")
cert: signable text address@hidden:bW9ub3RvbmU=]
checking cert address@hidden:bW9ub3RvbmU=]
cert: signable text address@hidden:bW9ub3RvbmU=]
db.fetch("SELECT keydata FROM public_keys where id = 'address@hidden'")
building verifier for 160-byte pub key
checking 175-byte (128 decoded) signature with 160-byte pub key
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE id = '637f0664797d02d1d711b0bd98552ebf01abb12d' AND name = 'branch' AND 
value = 'bW9ub3RvbmU=
'")
cert: signable text address@hidden:bW9ub3RvbmU=]
checking cert address@hidden:bW9ub3RvbmU=]
cert: signable text address@hidden:bW9ub3RvbmU=]
db.fetch("SELECT keydata FROM public_keys where id = 'address@hidden'")
building verifier for 160-byte pub key
checking 175-byte (128 decoded) signature with 160-byte pub key
picking sort operator for cert name 'ancestor'
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE id = '30dd466b5f8ab3ae92526687af2b7564c9d229ae' AND name = 'ancestor'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE id = '637f0664797d02d1d711b0bd98552ebf01abb12d' AND name = 'ancestor'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'YzI2MDhkMmRmYzdhYzg3OGQ1N2VhZDhmODg0NDFmMjI1Y2UxYjBjZg==
'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'MzBkZDQ2NmI1ZjhhYjNhZTkyNTI2Njg3YWYyYjc1NjRjOWQyMjlhZQ==
'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'manifest_certs' 
WHERE name = 'ancestor' AND value = 
'NjM3ZjA2NjQ3OTdkMDJkMWQ3MTFiMGJkOTg1NTJlYmYwMWFiYjEyZA==
'")
cert: signable text 
address@hidden:MzBkZDQ2NmI1ZjhhYjNhZTkyNTI2Njg3YWYyYjc1NjRjOWQyMjlhZQ==]
checking cert 
address@hidden:MzBkZDQ2NmI1ZjhhYjNhZTkyNTI2Njg3YWYyYjc1NjRjOWQyMjlhZQ==]
cert: signable text 
address@hidden:MzBkZDQ2NmI1ZjhhYjNhZTkyNTI2Njg3YWYyYjc1NjRjOWQyMjlhZQ==]
db.fetch("SELECT keydata FROM public_keys where id = 'address@hidden'")
building verifier for 160-byte pub key
checking 175-byte (128 decoded) signature with 160-byte pub key
progress: selected update target 637f0664797d02d1d711b0bd98552ebf01abb12d
db.fetch("SELECT id FROM 'manifests' WHERE id = 
'637f0664797d02d1d711b0bd98552ebf01abb12d'")
db.fetch("SELECT data FROM 'manifests' WHERE id = 
'637f0664797d02d1d711b0bd98552ebf01abb12d'")
building patch set c2608d2dfc7ac878d57ead8f88441f225ce1b0cf -> 
637f0664797d02d1d711b0bd98552ebf01abb12d
constructed manifest_changes (7 dels, 8 adds)
indexing add: ChangeLog 35154d85098fef4e1808a2fd0aa659c790c8bcf2
indexing add: commands.cc 9d8394e308522f3ad7a1d1a36de6f317dc501c58
indexing add: commands.hh 59f626fd0c5cdcf02daf256c3a20aec01f9c7fe3
indexing add: diff_patch.cc 5e80be9590b587d7e56fb0bc884a53a2da8f0913
indexing add: monotone.cc ff0a32a8dead94db5106432640a419b6582c45b6
indexing add: tests/t_genkey.at 303ef4de1d6b4bb8d9a1f5a5f19c38e373fa526b
indexing add: tests/t_unidiff2.at a9033f24ed9607e0970c1d7779badd1d3a3fc7f7
indexing add: testsuite.at 80857fc87e2bf8572669db103946bdd7ac0a3d6a
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'9ef89ffcb878ba9f8d9722308802cad1ba47ec51'")
found true delta ChangeLog
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51'")
found true delta commands.cc
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'ff587fec9be2c83cf151a80822bf876baac5b01b'")
found true delta commands.hh
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'a1b642f1c106ed851aec225cf83c151137a6fde7'")
found true delta diff_patch.cc
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'6ff7d386602467f6471014ad4039cd2afe493d0b'")
found true delta monotone.cc
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'cbee025d736828b3a218906c3364c5a7a039c7e1'")
found true delta tests/t_genkey.at
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'b2ee9c035fcd616af528503847fce06e634ea470'")
found true delta testsuite.at
found 1 plain additions
matched 7 del/add pairs as deltas
merging addition tests/t_unidiff2.at...OK
merged 1 adds
attempting to merge conflicting deltas on commands.cc
trying to merge 9d8394e308522f3ad7a1d1a36de6f317dc501c58 <-> 
1fbc3b69448c430c7b8f67e811edc9964ff0f051 (ancestor: 
2fdc5405a533dfc81e28e02c482ca3d783225d51)
db.fetch("SELECT id, name, value, keypair, signature FROM 'file_certs' WHERE id
= '9d8394e308522f3ad7a1d1a36de6f317dc501c58' AND name = 'ancestor'")
db.fetch("SELECT id, name, value, keypair, signature FROM 'file_certs' WHERE id
= '1fbc3b69448c430c7b8f67e811edc9964ff0f051' AND name = 'ancestor'")
existing merges: 9d8394e308522f3ad7a1d1a36de6f317dc501c58 <-> 
1fbc3b69448c430c7b8f67e811edc9964ff0f051, 0 found
no reusable merge
db.fetch("SELECT id FROM 'files' WHERE id = 
'9d8394e308522f3ad7a1d1a36de6f317dc501c58'")
db.fetch("SELECT data FROM 'files' WHERE id = 
'9d8394e308522f3ad7a1d1a36de6f317dc501c58'")
db.fetch("SELECT id FROM 'files' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51'")
reconstructing 2fdc5405a533dfc81e28e02c482ca3d783225d51 in file_deltas
db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51'")
db.fetch("SELECT id FROM 'files' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51'")
db.fetch("SELECT base from 'file_deltas' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51'")
inserting edge: 2fdc5405a533dfc81e28e02c482ca3d783225d51 <- 
9d8394e308522f3ad7a1d1a36de6f317dc501c58
db.fetch("SELECT id FROM 'files' WHERE id = 
'9d8394e308522f3ad7a1d1a36de6f317dc501c58'")
db.fetch("SELECT data FROM 'files' WHERE id = 
'9d8394e308522f3ad7a1d1a36de6f317dc501c58'")
following delta 9d8394e308522f3ad7a1d1a36de6f317dc501c58 -> 
2fdc5405a533dfc81e28e02c482ca3d783225d51
db.fetch("SELECT delta FROM 'file_deltas' WHERE id = 
'2fdc5405a533dfc81e28e02c482ca3d783225d51' AND base = 
'9d8394e308522f3ad7a1d1a36de6f317dc501c58'")
calculating offsets from ancestor:[0..1668) to left:[0..1670)
sanity-checking offset table (sz=1668, ancestor=1668)
merging differences from ancestor:[0..1668) to right:[0..1710)
invariant 'I(ancestor_to_leftpos_map.at(ap) == lpos)' violated at 
../monotone/diff_patch.cc:402
db.execute("ROLLBACK")
 
*** Error: std::logic_error: ../monotone/diff_patch.cc:402: 
I(ancestor_to_leftpos_map.at(ap) == lpos)
 
**** error return code 205
**********  errors detected; see standard output for details  ***********