[Sorry keyboard trouble made me send prematurely] | I'm sorry to ask this, but are you sure to have an un-modified repository?
I am absolutely 100% certain that *I* made no changes. But darcs must have! Here is what 'darcs what' says: cd libraries/Cabal/ bash-3.2$ darcs what -ls ./Distribution/PackageDescription.hs -> ./Distribution/PackageDescription/Types.hs ./Distribution/PackageDescription/Check.hs -> ./Distribution/PackageDescription/QA.hs ./tests/UnitTest/Distribution/Simple/PreProcess/UnlitTest.hs -> ./tests/UnlitTest.hs A ./Distribution/PackageDescription.hs A ./Distribution/PackageDescription/Check.hs R ./Distribution/PackageDescription/QA.hs R ./Distribution/PackageDescription/Types.hs A ./tests/UnitTest/Distribution/Simple/PreProcess/UnlitTest.hs R ./tests/UnlitTest.hs a ./doc/Cabal.xml.~1~ bash-3.2$ OK. So I "darcs reverted" and am now trying to pull in this one repo...... Ha. It worked. So one bug (screwing up the working files) led to another (infinite time). That is v confusing to a punter like me. Nevertheless I'm unstuck, so thank you for that. I cannot say when the working-file screw up happened, but I have seen it happen before. I guess you have an open ticket on it? Or is it only darcs1? Thanks Simon | -----Original Message----- | From: Nicolas Pouillard [mailto:[EMAIL PROTECTED] | Sent: 08 September 2008 15:46 | To: [email protected]; [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED]; | Simon Peyton-Jones | Subject: [issue1065] Darcs taking infinite time to merge patches from Cabal | | | Nicolas Pouillard <[EMAIL PROTECTED]> added the comment: | | I'm sorry to ask this, but are you sure to have an un-modified repository? | | Here is the checks: | | $ darcs whatsnew -ls | (the purpose of -l is to be sure that no local file can conflict with some newly | added ones) | | $ darcs send --dry-run <PULL-URL> | (this to check that you don't have more patches than upstream) | | ---------- | nosy: +ertai | priority: -> bug | status: unread -> chatting | | __________________________________ | Darcs bug tracker <[EMAIL PROTECTED]> | <http://bugs.darcs.net/issue1065> | __________________________________
_______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
