This is a darcs bug, it seems. Roman and Manuel also noticed it.
Roman sez:
"just do a darcs revert/ darcs pull"
and it should be fine again.
claus.reinke:
> i just tried to bring my ghc repo up to date and got:
>
> == running darcs pull -av --repodir libraries/base
> Pulling from "http:/
i just tried to bring my ghc repo up to date and got:
== running darcs pull -av --repodir libraries/base
Pulling from "http://darcs.haskell.org/packages/base";...
..
diffing dir...
We have conflicts in the following files:
./Control/Compositor.hs
You have conflicting local changes to:
./Control/C
Build description = STABLE on i386-unknown-linux
(cam-02-unx.europe.corp.microsoft.com)
Build location= /playpen/simonmar/nightly/STABLE
Build config file = /home/simonmar/nightly/site/msrc/conf-STABLE-cam-02-unx
Nightly build started on cam-02-unx at Mon Mar 10 18:10:01 GMT 2008.
checki
Yes, that's right thanks. Sorry about that.
| -Original Message-
| From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Roman
Leshchinskiy
| Sent: 10 March 2008 00:13
| To: Don Stewart
| Cc: cvs-ghc@haskell.org
| Subject: Re: Validate fails
|
| Don Stewart wrote:
| >
| > Hey, I
Build results:
x86-64 Linux head: fail (failed darcs)
x86 Windows head fast: pass lost pass pass
kahl G5 Gentoo Linux head: pass
x86-64 Linux head unreg: fail (failed getsubrepos)
Dropping unexpected test passes reports from builders not seen in 7 days:
x86-64 Linux head unreg
Build results:
gabor stable: lost
mnemosyne x86-64 Gentoo stable: pass
tnaur x86 Linux stable: fail (failed stage1)
x86 Windows stable: fail (failed darcs)
x86 Windows stable fast:lost pass pass
x86-64 Linux stable:fail (failed getsubrepos)