On Sat, May 12, 2007 at 09:25:26PM +0200, Eric Y. Kow wrote: > On Mon, May 07, 2007 at 13:01:18 -0700, Will wrote: > > Here is a patch which fixes a stray import used only in non-win32 code, > > causing the win32 build to fail. > > Tommy, I believe the stray import is also fixed in the Simon Marlow exec > code (or maybe that plus various conflict resolutions).
Hm, I'm not sure which is best. The reason I haven't pushed in Simon's exec patch is of course the GHC 6.4 dependency. But that was a long time ago, and since then debian etch is out, and we should drop GHC 6.2 support. On the other hand it won't hurt to keep it in one more (soon to come) release now that it's practically in there for free. I don't plan to push any more (but trivial, or documentation) patches before 1.0.9. > Do you want me to accept this patch in unstable (and deal with the minor > conflicts), or would you prefer just pulling Simon's patches instead? Pulling Will's two lines patch into darcs-unstable took my computer ten minutes and created an 80 lines long, five levels deeply nested merger. But it was trivial to resolve. Pulling Simon's exec patch plus a conflicting pathc and their resolution patch into stable worked fine, but fore some (yet) unexplainable reason it causes the external.pl test to hang. I'm too tired to investigate that now. I'm currently leaning towards keeping 1.0.9 GHC 6.2 compatible and thus go with Will's patch for stable (merging and resolving it in unstable). -- Tommy Pettersson <[EMAIL PROTECTED]> _______________________________________________ darcs-devel mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-devel
