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

[graydon hoare]

Peter Simons wrote:

> I have tried the merge with this version, but it fails with
> the same error message:
> ...
>   monotone: conflict: file sets 'left dels' and 'right move sources' intersect

hey, no fair: that is a *different* error message (representing a 
different conflict). you didn't tell me you also deleted files! :)

I don't know. is it fair to say that

  "moving a file X->Y"

and

  "deleting X"

merges to

  "deleting Y"

? if so, it's a small patch to implement. as I said, I was quite 
conservative in the original formulation of what constitutes tree layout 
conflicts. it can certainly be made more aggressive.

-graydon