[darcs-devel] Re: [darcs-conflicts] bit more of a summary of new conflict-handling ideas

[Ganesh Sittampalam]

On Thu, 13 Jul 2006, David Roundy wrote:

> On Wed, Jul 12, 2006 at 08:53:57PM +0100, Ganesh Sittampalam wrote:

>> On Wed, 12 Jul 2006, David Roundy wrote:

>>> This would give us "for free" the feature that patches that are
>>> identical except in name do not conflict.
>>
>> I've said this before, but please don't allow this to happen without human
>> confirmation that it should. I know that in 99% of cases it's what's
>> wanted, but in the other 1% or 0.1% it's not, and it's much harder to sort
>> out the mess when it's happened unwantedly than vice versa.
>
> With the implementation I've got in mind, we could easily add a
> warning, perhaps even something analogous to the "!" in darcs changes
> -s when this happens.  It shouldn't in any case be hard to query the
> repository for primitive patches with multiple names.

This is no use unless we can then do something to force the conflict in 
all repositories, though.

Cheers,

Ganesh