[Monotone-devel] more merge problems

[Derek Scherger]

Hey there... I'm looking at getting xemacs and cvs style merging with conflict markers 
into my lua hooks but I seem to have things somewhat messed up. I've attached some details 
but if I've missed something important let me know. In the meantime I'm off to start with 
another database.


$ monotone heads
monotone: fetching heads of branch 'foobar'
branch 'foobar' is currently unmerged:
466cb3a782da8f54dd38030cc322e248f494e9b7
78861e2912958551c8e47503bc3b2657547f9c0d


$ monotone merge
monotone: fetching heads of branch 'foobar'
monotone: merging with manifest 1 / 2: 466cb3a782da8f54dd38030cc322e248f494e9b7 <-> 
78861e2912958551c8e47503bc3b2657547f9c0d
monotone: common ancestor 5b10b0474c1d7b5c0268d3a3fc92cc05e675f038 found, 
trying 3-way merge
monotone: misuse: failed to 3-way merge manifests 466cb3a782da8f54dd38030cc322e248f494e9b7 
and 78861e2912958551c8e47503bc3b2657547f9c0d via ancestor 
5b10b0474c1d7b5c0268d3a3fc92cc05e675f038

**** error return code: 1
******** errors detected; see standard output for details ********


$ monotone --verbose merge
monotone: set locale: LC_CTYPE=C, LC_MESSAGES=C
monotone: options path is MT/options
monotone: converting 2 bytes from UTF-8 to ANSI_X3.4-1968
monotone: converting 7 bytes from UTF-8 to ANSI_X3.4-1968
monotone: converting 2 bytes from UTF-8 to ANSI_X3.4-1968
monotone: converting 7 bytes from UTF-8 to ANSI_X3.4-1968
monotone: converting 8 bytes from ANSI_X3.4-1968 to UTF-8
monotone: converting 9 bytes from ANSI_X3.4-1968 to UTF-8
monotone: converting 5 bytes from ANSI_X3.4-1968 to UTF-8
monotone: opening rcfile '/home/derek/.monotonerc' ...
monotone: '/home/derek/.monotonerc' is ok
monotone: skipping nonexistent rcfile 'MT/monotonerc'
monotone: executing merge command
monotone: fetching heads of branch 'foobar'

...

monotone: found 1 plain additions
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: file sets 'left dels' and 'right move sources' do not intersect
monotone: file sets 'left move sources' and 'right deltas' do not intersect
monotone: file sets 'left deltas' and 'right move sources' 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 move destinations' do not 
intersect
monotone: file sets 'left move destinations' and 'right move sources' do not 
intersect
monotone: conflict: maps left add map and right add map disagree: file2 -> 
c4dfab5d296f28ec2863c3793b7b68fc416f15c7 and 2639ab96dcdb673ec3010a40dd54cdc4b77ee4d1
monotone: commands.cc:559: 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 466cb3a782da8f54dd38030cc322e248f494e9b7 
and 78861e2912958551c8e47503bc3b2657547f9c0d via ancestor 
5b10b0474c1d7b5c0268d3a3fc92cc05e675f038

**** error return code: 1
******** errors detected; see standard output for details ********
$



The last few lines seem like things are going bad...

--
Cheers,
Derek