Hi,

this is possibly pure paranoia patch. I am ambivalent about including it, but
it could be useful. With the help of this patch, I have concluded that the
inconsistent conflictors that arise during a branch-2.4/mainline merge
(btw. they happen both ways, so this is a symmetric bug; trying to pull

Sun Mar 21 11:17:33 CET 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Refactor makeRemovePatch: use foldM and split in two

into branch-2.4 exhibits the bug) only exist during the merge, and do not come
from either of the branches.

Yours,
   Petr.

1 patch for repository http://darcs.net:

Thu Apr 29 19:20:42 CEST 2010  Petr Rockai <me@mornfall.net>
  * Check conflictor consistency in "darcs check".

Attachments

• check-conflictor-consistency-in-_darcs-check__.dpatch
• unnamed

vanilla darcs head works fine, but with the patch running check on this 
repo:

http://dwim.hu/darcsweb/darcsweb.cgi?r=HEAD%20hu.dwim.slime;a=summary

i get this error:

darcs-with-filename-fixes: src/Darcs/Patch/Commute.lhs:640:9-22: No 
instance nor default method for class operation 
Darcs.Patch.Prim.isInconsistent

I think Petr has identified this as Attila having found a minor bug in
his patch (for which, thanks!)

New version, should address Attila's problem.

2 patches for repository darcs-unstable@darcs.net:darcs:

Mon Jun  7 21:39:39 CEST 2010  Petr Rockai <me@mornfall.net>
  * Check conflictor consistency in "darcs check".

Mon Jun  7 21:41:11 CEST 2010  Petr Rockai <me@mornfall.net>
  * Fix a bunch of "unused" warnings.

Attachments

• check-conflictor-consistency-in-_darcs-check__.dpatch
• unnamed

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@mornfall.net>
>   * Check conflictor consistency in "darcs check".
> 
> Mon Jun  7 21:41:11 CEST 2010  Petr Rockai <me@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?

Fix a bunch of "unused" warnings.
---------------------------------
I'll see if I can apply this now.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9

Eric Kow <kowey@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@mornfall.net>
>>   * Check conflictor consistency in "darcs check".
>> 
>> Mon Jun  7 21:41:11 CEST 2010  Petr Rockai <me@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.

Hi Ganesh, may I add this to your review requests? (having checked that
isInconsistent = isConsistent really is intentional)

I think it makes sense to go with this check for now. If any problems come 
up in release testing we can always reverse it.

This patch bundle (with 2 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-0bba455c7d5f8bf28abe45fa51df4a9de674e4fc

This patch bundle (with 2 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-0bba455c7d5f8bf28abe45fa51df4a9de674e4fc