[darcs-users] [patch227] Check conflictor consistency in "darcs check".

Petr Rockai me at mornfall.net
Tue Jun 8 09:39:40 UTC 2010


Eric Kow <kowey at darcs.net> writes:

> On Mon, Jun 07, 2010 at 19:58:47 +0000, Petr Ročkai wrote:
>> Mon Jun  7 21:39:39 CEST 2010  Petr Rockai <me at mornfall.net>
>>   * Check conflictor consistency in "darcs check".
>> 
>> Mon Jun  7 21:41:11 CEST 2010  Petr Rockai <me at mornfall.net>
>>   * Fix a bunch of "unused" warnings.
>
> Just a very quick check before I pass this on to any reviewers...
>
> Check conflictor consistency in "darcs check".
> ----------------------------------------------
>> hunk ./src/Darcs/Patch/Real.hs 368
>>             False <- return $ any (conflictsWith y') (x':ix')
>>             False <- return $ any (conflictsWith x') iy'
>>             return (InvConflictor ix xx x :> Conflictor iy (invert iyy) y)
>> +    isInconsistent = isConsistent
>
> Is that right?
Yes, it is right. It does look funny though. I wouldn't mind if someone
followed up with a naming cleanup. :))

> Fix a bunch of "unused" warnings.
> ---------------------------------
> I'll see if I can apply this now.
I think it depended on the previous, but maybe not anymore?

Yours,
   Petr.


More information about the darcs-users mailing list