On Tue, Jun 05, 2007 at 09:31:50AM +0200, Jon Olsson wrote:
> Hi, here's an update to darcs 1.0.9, please note that I've only tested
> this with the GHC 6.6.1 port that Matthias Kilian recently submitted.
- CONFIGURE_ARGS needs an additional --without-docs, else you get a
pointless latex and dvips run.
- The grep(1) command line of tests/missed_resolution_pl is still broken
(not enough quotes), so is the patch we'd in our tree (not enough
quotes, too). See patch (against the test script) at the end of
this mail.
Everything else looks fine.
> Testing on !i386 most appreciated.
That's amd64 for now, since i386 and amd64 are the only archs with
a working ghc.
Ciao,
Kili
--- tests/missed_resolution.pl.orig Mon Jun 4 13:39:21 2007
+++ tests/missed_resolution.pl Tue Jun 5 13:27:18 2007
@@ -46,8 +46,14 @@ darcs "pull --all ../tmp2";
# we should have a marked conflict now.
# we resolve it simply by removing conflict markers.
-# I'm too lazy to translate this to Perl right now.
-`grep -v '\(\^ \^\|\*\*\|v v\)' A > tmp`;
+open(A, "A") || die;
+open(TMP, ">tmp") || die;
+while (<A>) {
+ (/\^ \^|\*\*|v v/) or print TMP;
+}
+close(A);
+close(TMP);
+
mv('tmp','A');
darcs "record -A x -m 'resolve' --all";
