conflicts in libraries/base?

[Ian Lynagh]

On Mon, Mar 10, 2008 at 01:27:24PM -0700, Donald Bruce Stewart wrote:
> 
> This is a darcs bug, it seems. Roman and Manuel also noticed it.

What version of darcs is this? I haven't seen this problem with:

$ darcs --version
1.0.9rc1 (release candidate 1)

> > == 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.


Thanks
Ian