In principle this might be behaviour-changing, but I don't think it is
and it seems like the obvious thing to do. The tests are fine with it.

1 patch for repository darcs-unstable@darcs.net:screened:

Mon Nov 22 06:33:42 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * make checkUnrecordedConflicts use the correct patch type for the repo

Attachments

• make-checkunrecordedconflicts-use-the-correct-patch-type-for-the-repo.dpatch
• unnamed

This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/screened.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_screened.html#bundle-9307535b6f30c9600b71573a79bbd0aff0283a21

This patch bundle (with 1 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-9307535b6f30c9600b71573a79bbd0aff0283a21

Just resending this because it didn't make it to the tracker
(could not serialize due to concurrent access)

On Sat, Jan 01, 2011 at 17:16:00 +0000, Eric Kow wrote:
> On Tue, Nov 23, 2010 at 23:00:54 +0000, Ganesh Sittampalam wrote:
> > In principle this might be behaviour-changing, but I don't think it is
> > and it seems like the obvious thing to do. The tests are fine with it.
> > 
> > 1 patch for repository darcs-unstable@darcs.net:screened:
> > 
> > Mon Nov 22 06:33:42 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
> >   * make checkUnrecordedConflicts use the correct patch type for the repo
> 
> Looks good to me.
> 
> make checkUnrecordedConflicts use the correct patch type for the repo
> ---------------------------------------------------------------------
> > Ganesh Sittampalam <ganesh@earth.li>**20101122063342
> > -    where cuc :: Repository Patch C(r u t) -> IO Bool
> > +    where cuc :: Repository p C(r u t) -> IO Bool
> 
> Context here is that Patch is for Darcs 1 patches and that RealPatch
> is for Darcs 2 patches.
> 
> At first I was scratching my head at how the old code worked, but I
> guess that's just all the other functions used here taking type variable
> for patches and so not caring.  So I *think* this means we now have
> also extra assurance being forced to take both kinds into account.
> For example, now we know that nothing in cuc or the stuff it calls
> pattern matches on Patch stuff.

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:kowey@jabber.fr (Jabber or Google Talk only)

Whoops...

[ 97 of 156] Compiling Darcs.Repository.Internal ( 
src/Darcs/Repository/Internal.hs, dist/build/darcs/darcs-
tmp/Darcs/Repository/Internal.o )

src/Darcs/Repository/Internal.hs:449:11:
    Couldn't match expected type `p' against inferred type `Patch'
      `p' is a rigid type variable bound by
          the type signature for `checkUnrecordedConflicts'
            at src/Darcs/Repository/Internal.hs:445:35
      Expected type: Repository p
      Inferred type: Repository Patch
    In the first argument of `cuc', namely `repository'
    In the expression: cuc repository
cabal: Error: some packages failed to install:

Do we roll this back or is there something else we need to apply?  
Sorry, I must have not compiled Darcs when I pushed this :-(

On Wed, 5 Jan 2011, Eric Kow wrote:

> Eric Kow <kowey@darcs.net> added the comment:
>
> Whoops...
>
> [ 97 of 156] Compiling Darcs.Repository.Internal (
> src/Darcs/Repository/Internal.hs, dist/build/darcs/darcs-
> tmp/Darcs/Repository/Internal.o )
>
> src/Darcs/Repository/Internal.hs:449:11:
>    Couldn't match expected type `p' against inferred type `Patch'
>      `p' is a rigid type variable bound by
>          the type signature for `checkUnrecordedConflicts'
>            at src/Darcs/Repository/Internal.hs:445:35
>      Expected type: Repository p
>      Inferred type: Repository Patch
>    In the first argument of `cuc', namely `repository'
>    In the expression: cuc repository
> cabal: Error: some packages failed to install:
>
> Do we roll this back or is there something else we need to apply?
> Sorry, I must have not compiled Darcs when I pushed this :-(

There's a semantic dependency on Florent's 'resolve issue1978' patch. By 
coincidence I reviewed that today so I'll push it now.

Ganesh

This patch bundle (with 1 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-9307535b6f30c9600b71573a79bbd0aff0283a21