[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] merge failure
From: |
Peter Simons |
Subject: |
[Monotone-devel] merge failure |
Date: |
28 Dec 2003 14:34:40 +0100 |
Apparently, I managed to screw my test repository up to the
point where monotone refuses to work with it. Here's the
output from running "monotone --verbose merge":
| monotone: opening rcfile '/home/simons/.monotonerc' ... monotone: ok
| monotone: skipping nonexistent rcfile 'MT/monotonerc'
| monotone: executing merge command
| monotone: fetching heads of branch 'test-b'
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
manifest_certs WHERE (name = 'ancestor' OR name = 'branch') AND id IN (SELECT
id FROM manifest_certs WHERE name = 'branch' AND value = 'dGVzdC1i
| ')")
| monotone: db.fetch("SELECT id FROM public_keys WHERE id = 'address@hidden'")
| monotone: db.fetch("SELECT keydata FROM public_keys where id =
'address@hidden'")
| monotone: cert: signable text address@hidden:dGVzdC1i]
| monotone: building verifier for 160-byte pub key
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text address@hidden:dGVzdC1i]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text address@hidden:dGVzdC1i]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text address@hidden:dGVzdC1i]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text address@hidden:dGVzdC1i]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: began with 5 candidate heads
| monotone: cert: signable text
address@hidden:NmQ2MGJkNjYyYjQzZWI2ZWJiODc1YWYwNzNlNjYwODQ3NWU4MzY3Ng==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:ZjEyZDRmNjg0Y2YxM2IxNDc5ZTE2NjQwNmU2ZmE4MWNkMTE1MGM1Mw==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:MDU5YWIyY2RiMDViYzVlZmY1ODg1ZmRlNTlhYzU2YjU1YzM2YjNkMg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: reduced to 2 heads
| monotone: lua istable() failed in begin
| monotone: merging with manifest 1 / 2:
1f32eb74c9b1ba2d9f8b2468032a81a74274887e <->
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: db.execute("BEGIN")
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'1f32eb74c9b1ba2d9f8b2468032a81a74274887e'")
| monotone: reconstructing 1f32eb74c9b1ba2d9f8b2468032a81a74274887e in
manifest_deltas
| monotone: db.fetch("SELECT id FROM 'manifest_deltas' WHERE id =
'1f32eb74c9b1ba2d9f8b2468032a81a74274887e'")
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'1f32eb74c9b1ba2d9f8b2468032a81a74274887e'")
| monotone: db.fetch("SELECT base from 'manifest_deltas' WHERE id =
'1f32eb74c9b1ba2d9f8b2468032a81a74274887e'")
| monotone: inserting edge: 1f32eb74c9b1ba2d9f8b2468032a81a74274887e <-
59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3'")
| monotone: db.fetch("SELECT base from 'manifest_deltas' WHERE id =
'59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3'")
| monotone: inserting edge: 59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3 <-
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: db.fetch("SELECT base from 'manifest_deltas' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: inserting edge: f12d4f684cf13b1479e166406e6fa81cd1150c53 <-
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: db.fetch("SELECT data FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: following delta d39e9ddf4b4903cc76220f51288164de0a33b582 ->
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT delta FROM 'manifest_deltas' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53' AND base =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: following delta f12d4f684cf13b1479e166406e6fa81cd1150c53 ->
59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3
| monotone: db.fetch("SELECT delta FROM 'manifest_deltas' WHERE id =
'59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3' AND base =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: following delta 59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3 ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: db.fetch("SELECT delta FROM 'manifest_deltas' WHERE id =
'1f32eb74c9b1ba2d9f8b2468032a81a74274887e' AND base =
'59844ce98acea6c2b721ab0cfeb4ca3983f9c4c3'")
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: db.fetch("SELECT data FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: searching for common ancestors of
1f32eb74c9b1ba2d9f8b2468032a81a74274887e and
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1f32eb74c9b1ba2d9f8b2468032a81a74274887e' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:MTc3OTI2MWYyMGVmNTA4YjY0MTEwYmZhMmFmNjk4NDRhMTExYjdjZA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:NmQ2MGJkNjYyYjQzZWI2ZWJiODc1YWYwNzNlNjYwODQ3NWU4MzY3Ng==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:ZjEyZDRmNjg0Y2YxM2IxNDc5ZTE2NjQwNmU2ZmE4MWNkMTE1MGM1Mw==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: resolving 3 ancestors at limit 255
| monotone: seeking LCA of historical merge
1779261f20ef508b64110bfa2af69844a111b7cd <->
6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: searching for common ancestors of
1779261f20ef508b64110bfa2af69844a111b7cd and
6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1779261f20ef508b64110bfa2af69844a111b7cd' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:OTE3NmQwYzZkOWJjOGUxYTRmMmRhYWM3Njc5ZTY4YzBjYWE0ZjJkYg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: resolving 1 ancestors at limit 254
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '6d60bd662b43eb6ebb875af073e6608475e83676' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:MDU5YWIyY2RiMDViYzVlZmY1ODg1ZmRlNTlhYzU2YjU1YzM2YjNkMg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:MTc3OTI2MWYyMGVmNTA4YjY0MTEwYmZhMmFmNjk4NDRhMTExYjdjZA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: resolving 2 ancestors at limit 254
| monotone: seeking LCA of historical merge
059ab2cdb05bc5eff5885fde59ac56b55c36b3d2 <->
1779261f20ef508b64110bfa2af69844a111b7cd
| monotone: searching for common ancestors of
059ab2cdb05bc5eff5885fde59ac56b55c36b3d2 and
1779261f20ef508b64110bfa2af69844a111b7cd
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '059ab2cdb05bc5eff5885fde59ac56b55c36b3d2' AND name
= 'ancestor'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1779261f20ef508b64110bfa2af69844a111b7cd' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:OTE3NmQwYzZkOWJjOGUxYTRmMmRhYWM3Njc5ZTY4YzBjYWE0ZjJkYg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: resolving 1 ancestors at limit 253
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db' AND name
= 'ancestor'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db' AND name
= 'ancestor'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = 'd39e9ddf4b4903cc76220f51288164de0a33b582' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:ZjEyZDRmNjg0Y2YxM2IxNDc5ZTE2NjQwNmU2ZmE4MWNkMTE1MGM1Mw==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: resolving 1 ancestors at limit 255
| monotone: found common ancestor f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: common ancestor f12d4f684cf13b1479e166406e6fa81cd1150c53 found,
trying 3-way merge
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: reconstructing f12d4f684cf13b1479e166406e6fa81cd1150c53 in
manifest_deltas
| monotone: db.fetch("SELECT id FROM 'manifest_deltas' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: db.fetch("SELECT base from 'manifest_deltas' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53'")
| monotone: inserting edge: f12d4f684cf13b1479e166406e6fa81cd1150c53 <-
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: db.fetch("SELECT id FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: db.fetch("SELECT data FROM 'manifests' WHERE id =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: following delta d39e9ddf4b4903cc76220f51288164de0a33b582 ->
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT delta FROM 'manifest_deltas' WHERE id =
'f12d4f684cf13b1479e166406e6fa81cd1150c53' AND base =
'd39e9ddf4b4903cc76220f51288164de0a33b582'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1f32eb74c9b1ba2d9f8b2468032a81a74274887e' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:MTc3OTI2MWYyMGVmNTA4YjY0MTEwYmZhMmFmNjk4NDRhMTExYjdjZA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:NmQ2MGJkNjYyYjQzZWI2ZWJiODc1YWYwNzNlNjYwODQ3NWU4MzY3Ng==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:ZjEyZDRmNjg0Y2YxM2IxNDc5ZTE2NjQwNmU2ZmE4MWNkMTE1MGM1Mw==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1f32eb74c9b1ba2d9f8b2468032a81a74274887e' AND name
= 'rename'")
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAADM0N7c0MjNMMzJITTM1sEgyMzE0NEhKSzRKTDOztDAxSTQ0NEwyT07hAgCTqEcfKQAAAA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAADNMMzZKTTI3SbZMMkxKNEqxTLNIMjIxszAwNkq0MEw0NzEyN7GwME/lAgAPWJDpKQAAAA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAAEszNEoxSTOzMElOMzROMjQxt0w1NDMzMTBLNUtLtDBMTjE0NDVINjXmAgDdWHU9KQAAAA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: found 3 incident rename edges at node
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: exploring renames from parents of
1f32eb74c9b1ba2d9f8b2468032a81a74274887e, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1779261f20ef508b64110bfa2af69844a111b7cd' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:OTE3NmQwYzZkOWJjOGUxYTRmMmRhYWM3Njc5ZTY4YzBjYWE0ZjJkYg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '1779261f20ef508b64110bfa2af69844a111b7cd' AND name
= 'rename'")
| monotone: found 0 incident rename edges at node
1779261f20ef508b64110bfa2af69844a111b7cd
| monotone: exploring renames from parents of
1779261f20ef508b64110bfa2af69844a111b7cd, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db' AND name
= 'ancestor'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db' AND name
= 'rename'")
| monotone: found 0 incident rename edges at node
9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db
| monotone: exploring renames from parents of
9176d0c6d9bc8e1a4f2daac7679e68c0caa4f2db, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '6d60bd662b43eb6ebb875af073e6608475e83676' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:MDU5YWIyY2RiMDViYzVlZmY1ODg1ZmRlNTlhYzU2YjU1YzM2YjNkMg==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:MTc3OTI2MWYyMGVmNTA4YjY0MTEwYmZhMmFmNjk4NDRhMTExYjdjZA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '6d60bd662b43eb6ebb875af073e6608475e83676' AND name
= 'rename'")
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAADM0N7c0MjNMMzJITTM1sEgyMzE0NEhKSzRKTDOztDAxSTQ0NEwyT07hAgCTqEcfKQAAAA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAADNLMTNISjEzM0oyMU5NMktNSrIwN01MMzA3TjUzM7AwMTdNtTA2MzfjAgAU2ipVKQAAAA==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: found 2 incident rename edges at node
6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: exploring renames from parents of
6d60bd662b43eb6ebb875af073e6608475e83676, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '059ab2cdb05bc5eff5885fde59ac56b55c36b3d2' AND name
= 'ancestor'")
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = '059ab2cdb05bc5eff5885fde59ac56b55c36b3d2' AND name
= 'rename'")
| monotone: found 0 incident rename edges at node
059ab2cdb05bc5eff5885fde59ac56b55c36b3d2
| monotone: exploring renames from parents of
059ab2cdb05bc5eff5885fde59ac56b55c36b3d2, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: adding lone incident edge 1779261f20ef508b64110bfa2af69844a111b7cd
-> 6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: merging rename edge 1779261f20ef508b64110bfa2af69844a111b7cd ->
6d60bd662b43eb6ebb875af073e6608475e83676 with ->
6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: adding lone incident edge 6d60bd662b43eb6ebb875af073e6608475e83676
-> 6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: merging rename edge 6d60bd662b43eb6ebb875af073e6608475e83676 ->
6d60bd662b43eb6ebb875af073e6608475e83676 with ->
6d60bd662b43eb6ebb875af073e6608475e83676
| monotone: ancestor edge 6d60bd662b43eb6ebb875af073e6608475e83676 ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e is relevant, merging with current
| monotone: merging rename edge -> 6d60bd662b43eb6ebb875af073e6608475e83676
with -> 1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: adding lone incident edge 1779261f20ef508b64110bfa2af69844a111b7cd
-> 1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: merging rename edge 1779261f20ef508b64110bfa2af69844a111b7cd ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e with ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: adding lone incident edge 1f32eb74c9b1ba2d9f8b2468032a81a74274887e
-> 1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: merging rename edge 1f32eb74c9b1ba2d9f8b2468032a81a74274887e ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e with ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: adding lone incident edge f12d4f684cf13b1479e166406e6fa81cd1150c53
-> 1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: merging rename edge f12d4f684cf13b1479e166406e6fa81cd1150c53 ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e with ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: building patch set f12d4f684cf13b1479e166406e6fa81cd1150c53 ->
1f32eb74c9b1ba2d9f8b2468032a81a74274887e
| monotone: constructed manifest_changes (2 dels, 1 adds)
| monotone: indexing add: foo 9b8d9b882bb03ca63fcfe9ce46cbf1bcc58e7fb6
| monotone: db.fetch("SELECT id FROM 'file_deltas' WHERE id =
'da39a3ee5e6b4b0d3255bfef95601890afd80709'")
| monotone: db.fetch("SELECT id FROM 'files' WHERE id =
'da39a3ee5e6b4b0d3255bfef95601890afd80709'")
| monotone: found true delta foo
| monotone: found delete new-file
| monotone: found 1 plain deletes
| monotone: matched 1 del/add pairs as deltas
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = 'd39e9ddf4b4903cc76220f51288164de0a33b582' AND name
= 'ancestor'")
| monotone: cert: signable text
address@hidden:ZjEyZDRmNjg0Y2YxM2IxNDc5ZTE2NjQwNmU2ZmE4MWNkMTE1MGM1Mw==]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: db.fetch("SELECT id, name, value, keypair, signature FROM
'manifest_certs' WHERE id = 'd39e9ddf4b4903cc76220f51288164de0a33b582' AND name
= 'rename'")
| monotone: cert: signable text
address@hidden:H4sIAAAAAAAAAEszNEoxSTOzMElOMzROMjQxt0w1NDMzMTBLNUtLtDBMTjE0NDVINjXmykst103LzEnlSspJ5AIA5LB6EjYAAAA=]
| monotone: checking 175-byte (128 decoded) signature
| monotone: cert ok
| monotone: found 1 incident rename edges at node
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: exploring renames from parents of
d39e9ddf4b4903cc76220f51288164de0a33b582, seeking towards
f12d4f684cf13b1479e166406e6fa81cd1150c53
| monotone: adding lone incident edge f12d4f684cf13b1479e166406e6fa81cd1150c53
-> d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: merging rename edge f12d4f684cf13b1479e166406e6fa81cd1150c53 ->
d39e9ddf4b4903cc76220f51288164de0a33b582 with ->
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: merged in rename of new-file -> bla
| monotone: building patch set f12d4f684cf13b1479e166406e6fa81cd1150c53 ->
d39e9ddf4b4903cc76220f51288164de0a33b582
| monotone: constructed manifest_changes (1 dels, 1 adds)
| monotone: indexing add: bla 55c30246a8e3f3a30c42bdf2c3895b5d52ada08e
| monotone: found move new-file -> bla
| monotone: matched 1 del/add pairs as moves
| monotone: file sets 'left adds' and 'right dels' do not intersect
| monotone: file sets 'left dels' and 'right adds' do not intersect
| monotone: file sets 'left move sources' and 'right adds' do not intersect
| monotone: file sets 'left adds' and 'right move sources' do not intersect
| monotone: file sets 'left move sources' and 'right dels' do not intersect
| monotone: conflict: file sets 'left dels' and 'right move sources' intersect
| monotone: commands.cc:569: usage constraint 'N(merge3(ancestor_map,
left_map, right_map, app, merger, merged_map, left_renames.mapping,
right_renames.mapping))' violated
| monotone: db.execute("ROLLBACK")
| monotone: misuse: failed to 3-way merge manifests
1f32eb74c9b1ba2d9f8b2468032a81a74274887e and
d39e9ddf4b4903cc76220f51288164de0a33b582 via ancestor
f12d4f684cf13b1479e166406e6fa81cd1150c53
|
| **** error return code 1
| ********** errors detected; see standard output for details ***********
All I did was to repeatedly propagate changes from branch
'test-b' to 'test-a'. I did not touch the database myself or
anything.
Peter
- [Monotone-devel] merge failure,
Peter Simons <=