Re: [issue1065] Darcs taking infinite time to merge patches from Cabal

2008-09-08 Thread Claus Reinke
| 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/Packag

RE: [issue1065] Darcs taking infinite time to merge patches from Cabal

2008-09-08 Thread Simon Peyton-Jones
TECTED]; | 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 wh

RE: [issue1065] Darcs taking infinite time to merge patches from Cabal

2008-09-08 Thread 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

[issue1065] Darcs taking infinite time to merge patches from Cabal

2008-09-08 Thread Nicolas Pouillard
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 (thi

FW: [issue1065] Darcs taking infinite time to merge patches from Cabal

2008-09-08 Thread Simon Peyton-Jones
[Sending again this time with the trace as a zipped attachment, and *not* inline; sorry. It's got through to [EMAIL PROTECTED]; this cc to cvs-ghc is for info.] More darcs2 woe, this time on Linux. I'm simply merging patches from the cabal repository into my working tree. My working tree is a