conflicts in libraries/base?

[Claus Reinke]

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

$ darcs --version
1.0.9 (release)

(on win/xp with cygwin). the "offending" patch was the one of
Don's untabify patches touching Control/Category.hs.

it did look as if darcs got confused about what was
local change and what was pulled patch - after cancelling,
'darcs whatsnew' suddenly started reporting local changes
affecting that file as well, which were really older patches,
not changes of mine.

currently, 'darcs whatsnew' reports other nonsense:

$ darcs whatsnew
{
move ./distrib/MacOS/installer-docs/lambda-logo.png ./distrib/MacOS/lambda-logo.png
..
addfile ./distrib/MacOS/installer-docs/lambda-logo.png
binary ./distrib/MacOS/installer-docs/lambda-logo.png
binary ./distrib/MacOS/lambda-logo.png
rmfile ./distrib/MacOS/lambda-logo.png
}

in both cases, there was a file move involved, and the "move"
was accompanied by "addfile/rmfile", which either looks like
a duplication or an undo, depending on the order of parameters
to "move"..

claus