On Sat, Jan 26, 2008 at 07:59:00PM +0100, Twan van Laarhoven wrote:
> Ian Lynagh wrote:
> >I didn't apply these because they contained or caused conflicts:
> >
> >Added Applicative instance for UniqSM
> >Monadify rename/RnExpr: use do, return and standard monad functions
> >Monadify rename/RnSource: use do, return and standard monad functions
> >Monadify typecheck/TcHsSyn: use do, return and standard monad functions
> >Monadify rename/RnEnv: use do, return and standard monad functions
>
> I have resolved these conflicts, patches are attached. It required only a
> couple
> of changes. I had no conflicts in typecheck/TcHsSyn.
Ah, sorry, I wasn't clear: largely due to performance issues in darcs
1.*, we currently try to avoid applying patches with conflicts. If you
unrecord the patch and the conflict resolution and then record again,
you should end up with a patch with the same effect but no conflicts.
Or, if you prefer, I can do so for these patches?
I had a quick look but couldn't easily find the above explained on the
wiki, so I've added a paragraph to
http://hackage.haskell.org/trac/ghc/wiki/GettingStarted
Thanks
Ian
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
