Help: pending has conflicts

Hello,

When I say "darcs whatsnew --summary" I get

plink: unknown option "-O"
Yikes, pending has conflicts!
R ./Database/Oracle/OCIFunctions_stub.c
R ./Database/Oracle/OCIFunctions_stub.h
R ./Database/PostgreSQL/PGFunctions_stub.c
R ./Database/PostgreSQL/PGFunctions_stub.h

The four deleted files exist on the filesystem, but they
should not be
part of the repo, as they are generated from .hs sources.
I've done
darcs repair and check, so I'm at a bit of a loss as to what
to do
next.

Win XP, darcs 1.0.7.

Thanks,
Alistair
_______________________________________________
darcs-users mailing list
darcs-usersdarcs.net

http://lists.osuosl.org/mailman/listinfo/darcs-users

2007/10/1, Alistair Bayley <alistairabayley.org>:
...
> Yikes, pending has conflicts!
...
> The four deleted files exist on the filesystem, but
they should not be
> part of the repo, as they are generated from .hs
sources. I've done
> darcs repair and check, so I'm at a bit of a loss as to
what to do
> next.

You have tried to remove _darcs/patched/pending?

-- 
Pekka.Pessi mail at nokia.com
_______________________________________________
darcs-users mailing list
darcs-usersdarcs.net

http://lists.osuosl.org/mailman/listinfo/darcs-users

> > The four deleted files exist on the filesystem,
but they should not be
> > part of the repo, as they are generated from .hs
sources. I've done
> > darcs repair and check, so I'm at a bit of a loss
as to what to do
> > next.
>
> You have tried to remove _darcs/patched/pending?

I have now. I also had to go into current and remove the
files, which
had somehow ended up in there (I don't know how, as they
AFAICT have
not been added to the repo).

Seems to be OK now.

Thanks,
alistair
_______________________________________________
darcs-users mailing list
darcs-usersdarcs.net

http://lists.osuosl.org/mailman/listinfo/darcs-users