conflicts in libraries/base?

[Don Stewart]

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://darcs.haskell.org/packages/base"...
> ..
> diffing dir...
> We have conflicts in the following files:
> ./Control/Compositor.hs
> You have conflicting local changes to:
> ./Control/Compositor.hs
> Proceed? [yn]
> Cancelled.
> 
> i thought conflicts were a nono for the head repo?
> 
> claus
> 
> 
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc