i've just run into that 'sh darcs-all' updating darcs-all issue again!-(
i think i've restored my local repo (made a copy, did 'darcs revert'
in the copy, then 'diff ghc ghc2', then copied over the changes that
were actually mine..). but even after './darcs-all pull -a', i still have
one odd remnant showing in './darcs-all whatsnew':
$ pwd
/cygdrive/c/fptools/ghc2/libraries/Cabal
$ darcs whatsnew
plink: unknown option "-O"
{
adddir ./cabal-upload
adddir ./cabal-upload/src
addfile ./cabal-upload/src/CabalUpload.hs
hunk ./cabal-upload/src/CabalUpload.hs 1
-
+
rmfile ./cabal-upload/src/CabalUpload.hs
rmdir ./cabal-upload/src
rmdir ./cabal-upload
}
$ ls -R ./cabal-upload
ls: ./cabal-upload: No such file or directory
$ darcs pull -av
plink: unknown option "-O"
Pulling from "http://darcs.haskell.org/packages/Cabal";...
We have the following new (to them) patches:
They have the following patches to pull:
No remote changes to pull in!
how do i get rid of that discrepancy? should i just delete
libraries/Cabal/_darcs/patches/pending ?
claus
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
