[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Lack of conflicts checking
From: |
Brian May |
Subject: |
Re: [Monotone-devel] Lack of conflicts checking |
Date: |
Tue, 07 Aug 2007 10:17:57 +1000 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) |
>>>>> "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.
--
Brian May <address@hidden>