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

[Peter Simons]

graydon hoare writes:

 > - remark at how this seems like a fundamental missing
 >   feature [...]

Unfortunately, things got worse. Now I can not only not
propagate anymore, now I cannot even merge the branch:

  peti:~/new-root$ monotone heads
  monotone: fetching heads of branch 'system.home.root'
  branch 'system.home.root' is currently unmerged:
  4dfb613a78242f31d0f4fdfb86be9769c51284e7 address@hidden 2004-05-27T17:12:18
  dc2c76dcc21de0fee287787e90849ee96a1411dc address@hidden 2004-05-27T17:10:01

  peti:~/new-root$ monotone merge
  monotone: fetching heads of branch 'system.home.root'
  monotone: merging with manifest 1 / 2: 
4dfb613a78242f31d0f4fdfb86be9769c51284e7 <-> 
dc2c76dcc21de0fee287787e90849ee96a1411dc
  monotone: common ancestor 47cc4f6a2761d7c1f11fa8200444b2484f0f9fcf found, 
trying 3-way merge
  monotone: misuse: failed to 3-way merge manifests 
4dfb613a78242f31d0f4fdfb86be9769c51284e7 and 
dc2c76dcc21de0fee287787e90849ee96a1411dc via ancestor 
47cc4f6a2761d7c1f11fa8200444b2484f0f9fcf

I guess I can work around this problem for the time being,
but IMHO this is a somewhat serious problem, and it would be
really useful if Monotone know how to resolve it. 

Peter