..and indeed, having followed your advice, the new tree contains the claimed not-present files. So all seems well. But it's a mystery to me. Simon | -----Original Message----- | From: ghc-devs [mailto:ghc-devs-bounces@haskell.org] On Behalf Of Simon | Peyton Jones | Sent: 13 January 2014 12:19 | To: Herbert Valerio Riedel | Cc: ghc-devs@haskell.org | Subject: RE: testsuite change | | and then? are all those untracked files really untracked? I definitely | didn't add them! Have they been lost from the tree somehow? | | | | -----Original Message----- | | From: Herbert Valerio Riedel [mailto:hvriedel@gmail.com] | | Sent: 13 January 2014 12:16 | | To: Simon Peyton Jones | | Cc: ghc-devs@haskell.org | | Subject: Re: testsuite change | | | | Hello Simon, | | | | On 2014-01-13 at 13:08:02 +0100, Simon Peyton Jones wrote: | | > I did 'git pull' in my source tree and got the error below. What | | > do I do now? | | | | the easist is to just move the testsuite folder out the way; | | | | e.g. mv testsuite/ testsuite-old/ | | _______________________________________________ | ghc-devs mailing list | ghc-devs@haskell.org | http://www.haskell.org/mailman/listinfo/ghc-devs