Re: [Monotone-devel] Lack of conflicts checking

[Derek Scherger]

Nathaniel Smith wrote:
> Question at hand is whether we would hit a sweeter spot on that
> predictability/usefulness trade-off if we made content edits conflict
> with file deletes.

A few months ago I was wondering what we do with the content marks when
merging with deletes. I'm not even sure we would *have* a content mark
available on the deleted side to compare with the not-deleted side
though. The node on the deleted side is gone and so are the marks.
Presumably we could go back and find the last content mark for the
deleted node though.

It seems at least somewhat sensible that a delete verses a content
change should be a conflict while a delete verses no content change
should not. We probably don't want this for name or attribute changes
though.

In terms of resolution deletion is pretty much the only option. You
could go delete things on the changed side before doing the merge
cleanly. This doesn't really help with the case Julio originally
described, in terms of helping to ensure a change to the deleted file
gets moved to some other appropriate place. It might at least point out
that some change was made though and perhaps inspire someone to go and
investigate.

Cheers,
Derek