On 2014-01-13 at 13:18:53 +0100, Simon Peyton Jones wrote: > and then? are all those untracked files really untracked? I > definitely didn't add them! Have they been lost from the tree > somehow?
Well, Git just detects there's already something which it would overwrite (as it doesn't know what a nested testsuite/.git means). So they're were only untracked from ghc.git's perspective. If you want to make sure you really have no uncommitted things there, just cd into testsuite/ (or testsuite-old if you moved it already), and run 'git status'/'git log' and other common Git commands to find out if there's something worth saving over from the old standalone testsuite.git (Git commands will use the first found .git/ folder while traversing upwards towards the filesystem root) HTH, hvr > > > | -----Original Message----- > | From: Herbert Valerio Riedel [mailto:[email protected]] > | Sent: 13 January 2014 12:16 > | To: Simon Peyton Jones > | Cc: [email protected] > | 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/ > -- "Elegance is not optional" -- Richard O'Keefe _______________________________________________ ghc-devs mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-devs
