On Sat, Nov 01, 2008 at 01:39:05PM -0700, Eric Kow wrote: > Salvo 9! > > Hopefully nice and relaxing this time? > > Tue Oct 28 05:48:36 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in ByteStringUtils > > Tue Oct 28 05:53:23 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Commands.Annotate > > Tue Oct 28 05:57:51 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Commands.Send > > Tue Oct 28 06:00:47 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Diff > > Tue Oct 28 06:01:46 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in External > > Tue Oct 28 06:02:32 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Lock > > Tue Oct 28 06:03:42 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Match > > Tue Oct 28 06:41:47 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in Patch.Apply > > Tue Oct 28 06:47:53 GMT 2008 Jason Dagit <[EMAIL PROTECTED]> > * use fmap in unit.lhs
Applied, thanks! And next time it'd be even better if you could pull over into a copy of darcs-unstable and deal with the conflicts before pushing! The trouble was that Don used darcs replace with '.' in the token definition, which conflicted with a darcs replace I'd made without '.' in the token definition, so the resolution then conflicted with Jason's darcs replace that depended on Dons' darcs replace, because it used a different token definition. We ought to have a policy on which sort of darcs replace to use on our Haskell files. I would prefer to restrict ourselves to tokens lacking in '.' and '-', since that's the Haskell definition of a token, and if we don't do that then code like map (lines.liftM) won't get replaced properly. David _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
