darcs

Patch 227 Check conflictor consistency in "darcs check".

Title Check conflictor consistency in "darcs check".
Superseder Nosy List attila.lendvai, ganesh, kowey, mornfall
Related Issues
Status accepted Assigned To ganesh
Milestone

Created on 2010-04-29.17:24:21 by mornfall, last changed 2011-05-10.20:05:36 by darcswatch. Tracked on DarcsWatch.

Files
File name Status Uploaded Type Edit Remove
check-conflictor-consistency-in-_darcs-check__.dpatch mornfall, 2010-04-29.17:24:21 text/x-darcs-patch
check-conflictor-consistency-in-_darcs-check__.dpatch mornfall, 2010-06-07.19:58:47 text/x-darcs-patch
unnamed mornfall, 2010-04-29.17:24:21
unnamed mornfall, 2010-06-07.19:58:47
See mailing list archives for discussion on individual patches.
Messages
msg10878 (view) Author: mornfall Date: 2010-04-29.17:24:21
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
msg11122 (view) Author: attila.lendvai Date: 2010-05-27.12:54:17
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
msg11134 (view) Author: kowey Date: 2010-05-28.09:21:26
I think Petr has identified this as Attila having found a minor bug in
his patch (for which, thanks!)
msg11313 (view) Author: mornfall Date: 2010-06-07.19:58:47
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
msg11324 (view) Author: kowey Date: 2010-06-08.09:30:08
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
msg11325 (view) Author: mornfall Date: 2010-06-08.09:37:34
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.
msg11327 (view) Author: kowey Date: 2010-06-08.09:54:39
Hi Ganesh, may I add this to your review requests? (having checked that
isInconsistent = isConsistent really is intentional)
msg11404 (view) Author: ganesh Date: 2010-06-13.22:20:49
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.
msg11516 (view) Author: darcswatch Date: 2010-06-21.18:06:28
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
msg14229 (view) Author: darcswatch Date: 2011-05-10.20:05:36
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
History
Date User Action Args
2010-04-29 17:24:21mornfallcreate
2010-04-29 17:25:42darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-83e4130e24cbaee33e2c45089bc8a3e7ca38da6d
2010-05-27 12:54:18attila.lendvaisetnosy: + attila.lendvai
messages: + msg11122
2010-05-28 09:21:26koweysetstatus: needs-review -> followup-requested
nosy: + kowey, - darcs-users
messages: + msg11134
2010-06-07 19:58:47mornfallsetfiles: + check-conflictor-consistency-in-_darcs-check__.dpatch, unnamed
messages: + msg11313
2010-06-07 20:00:46darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-83e4130e24cbaee33e2c45089bc8a3e7ca38da6d -> http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-0bba455c7d5f8bf28abe45fa51df4a9de674e4fc
2010-06-08 09:30:08koweysetmessages: + msg11324
2010-06-08 09:37:35mornfallsetmessages: + msg11325
2010-06-08 09:54:39koweysetstatus: followup-requested -> needs-review
assignedto: ganesh
messages: + msg11327
nosy: + ganesh
2010-06-13 22:20:49ganeshsetstatus: needs-review -> accepted-pending-tests
messages: + msg11404
2010-06-21 18:06:28darcswatchsetstatus: accepted-pending-tests -> accepted
messages: + msg11516
2011-05-10 17:36:22darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-0bba455c7d5f8bf28abe45fa51df4a9de674e4fc -> http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-83e4130e24cbaee33e2c45089bc8a3e7ca38da6d
2011-05-10 20:05:36darcswatchsetmessages: + msg14229