Re: [Monotone-devel] Lack of conflicts checking

[William Uther]

On 07/08/2007, at 10:17 AM, Brian May wrote:

> > > > > > "Thomas" == Thomas Moschny <address@hidden> writes:
>
>     Thomas> The problem is that monotone uses the DieDieDie merge
>     Thomas> strategy for aliveness of files, see
>     Thomas> http://revctrl.org/DieDieDieMerge. So, in every merge, a
>     Thomas> drop always wins.
>
> I really don't like this. In means if somebody accidently or
> deliberately deletes a file that shouldn't have been deleted, commits
> the result in the same branch, and then propagates the change, data
> may be lost. Consider for example if other people are working on the
> files which get deleted. When revisions are merged, the changes will
> be lost.

It is not wonderful, I agree.  Data is silently dropped from head  
revisions.  Data is not lost however.  It is still in the older  
committed versions and can be recovered.

Will         :-}