Re: Stuck again on submodules

Are you by any chance on a non-'master' branch of GHC? This happened to me when I ran `./sync-all pull` when on a local branch. There may be a simpler fix, but this is what worked for me: 1. `git checkout master` 2. `./sync-all pull` 3. `git checkout local_branch` 4. `git rebase master` The goal is to run `./sync-all pull` on the master branch and then to rebase your local branch against it. This should update the submodule metadata in your local branch. On Thu, May 9, 2013 at 8:31 AM, Simon Peyton-Jones wrote:

Afraid not. I'd tried "git submodule update". The command you give is a no-op; libraries/Cabal is stuck on commit 14c5a3f; and that's what git submodule status says it should be. But it shouldn't!

S

| -----Original Message----- | From: Jan Stolarek [mailto:jan.stolarek@p.lodz.pl] | Sent: 09 May 2013 13:21 | To: ghc-devs@haskell.org | Cc: Simon Peyton-Jones | Subject: Re: Stuck again on submodules | | Does this help: | | git submodule update libraries/Cabal/ | | ? | | Janek | | | | Dnia czwartek, 9 maja 2013, Simon Peyton-Jones napisał: | > Help! I can't build ghc! | > | > I get this | > utils/ghc-pkg/Main.hs:1160:24: | > Not in scope: `showSimpleInstalledPackageInfoField' | > Perhaps you meant `showInstalledPackageInfoField' (imported from | > Distribution.InstalledPackageInfo) | > | > And indeed, my libraries/Cabal is way behind | > | > simonpj@cam-05-unx:~/code/HEAD$ cd libraries/Cabal | > simonpj@cam-05-unx:~/code/HEAD/libraries/Cabal$ git log -1 commit | > 14c5a3f78c00772cf54c2fd5c920a64d53e6f594 | > Author: Gabor Greif | > Date: Wed Mar 20 22:27:15 2013 +0100 | > | > Fix typos | > | > "git submodule status" says | > 14c5a3f78c00772cf54c2fd5c920a64d53e6f594 libraries/Cabal | > (1_10_branch_forked-1682-g14c5a3f) | > 1f9f7175e747aad7c424f5b12be5b95f15286f0b | > libraries/Win32 (2009-06-25-50-g1f9f717) ...etc | > | > In another tree entirely "git submodule status" says | > b4d0c0... libraries/Cabal | > which looks right, because that commit does futz with | > showInstalledPackageInfoField. | > | > So it looks as if my main GHC repo somehow has the wrong commit for | Cabal. | > How do I make it right? | > | > This is so frustrating. Thanks | > | > Simon |

_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs