[Monotone-devel] Re: propagate failure: usage constaint

[Peter Simons]

graydon hoare writes:

 > 236c08b03a001120c0f82df3a6da7aa5bf95ffd8

I have tried the merge with this version, but it fails with
the same error message:

  monotone: db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'2c37823ad71daf1a43e3920e018e091b4c1f57ba'")
  monotone: found true delta .xinitrc
  monotone: db.fetch("SELECT id FROM 'file_deltas' WHERE id = 
'87f6db6de3a4f21fc5dbc30a2f19fe0212e99a8f'")
  monotone: found true delta .xsession
  monotone: found explicit move .ssh/config -> .ssh/config.m4
  monotone: explicit move .ssh/config -> .ssh/config.m4 accompanied by delta 
bfb8c3df43fda8ee83a02ef638252f0b49c33241 -> 
0f6f725fd16c61e90e225dc01084771f58d858fb
  monotone: found 2 plain additions
  monotone: matched 7 del/add pairs as deltas
  monotone: matched 2 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 destinations' and 'right adds' do not intersect
  monotone: file sets 'left adds' and 'right move destinations' do not intersect
  monotone: file sets 'left move destinations' and 'right dels' do not intersect
  monotone: file sets 'left dels' and 'right move destinations' do not intersect
  monotone: file sets 'left move destinations' and 'right deltas' do not 
intersect
  monotone: file sets 'left deltas' and 'right move destinations' 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:562: 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 
da39a3ee5e6b4b0d3255bfef95601890afd80709 and 
f9b3f9c6f4fdf8ce5cc1115a3d7cb645de04c46b via ancestor 
47cc4f6a2761d7c1f11fa8200444b2484f0f9fcf

Peter