
Herbert or others, What does this mean (in a clean tree) git checkout wip/orf Checking out files: 100% (159/159), done. M utils/haddock Branch wip/orf set up to track remote branch wip/orf from origin. Switched to a new branch 'wip/orf' simonpj@cam-05-unx:~/code/HEAD-3$ What's all this about haddock being modified? I've just checked out a branch, which is supposed to make everything line up, isn't it? Do you need to say "git submodule update" as well? Could this be documented in the (upcoming?) workflows page? Thanks Simon

I believe you need to run `git submodule update`. The orf branch was likely
set to use a different commit from the haddock repo than your current repo.
Git doesn't automatically assume that you want to switch your submodule to
use the same commit as the orf branch was using, hence you now have a
"change" in your checkout relative to the orf branch (i.e. you changed to
using a different commit from the haddock repo.)
On Thu, Apr 24, 2014 at 9:50 AM, Simon Peyton Jones
Herbert or others,
What does this mean (in a clean tree)
git checkout wip/orf
Checking out files: 100% (159/159), done.
*M utils/haddock*
Branch wip/orf set up to track remote branch wip/orf from origin.
Switched to a new branch 'wip/orf'
simonpj@cam-05-unx:~/code/HEAD-3$
What’s all this about haddock being modified? I’ve just checked out a branch, which is supposed to make everything line up, isn’t it?
Do you need to say “git submodule update” as well?
Could this be documented in the (upcoming?) workflows page?
Thanks
Simon
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs

I believe sync-all pull is supposed to automatically do a submodule update. If it doesn't then that's a bug - Simon please create a ticket. Cheers, Simon On 24/04/2014 09:36, Johan Tibell wrote:
I believe you need to run `git submodule update`. The orf branch was likely set to use a different commit from the haddock repo than your current repo. Git doesn't automatically assume that you want to switch your submodule to use the same commit as the orf branch was using, hence you now have a "change" in your checkout relative to the orf branch (i.e. you changed to using a different commit from the haddock repo.)
On Thu, Apr 24, 2014 at 9:50 AM, Simon Peyton Jones
mailto:simonpj@microsoft.com> wrote: Herbert or others,____
What does this mean (in a clean tree)____
git checkout wip/orf____
Checking out files: 100% (159/159), done.____
*M utils/haddock____*
Branch wip/orf set up to track remote branch wip/orf from origin.____
Switched to a new branch 'wip/orf'____
simonpj@cam-05-unx:~/code/HEAD-3$____
What’s all this about haddock being modified? I’ve just checked out a branch, which is supposed to make everything line up, isn’t it? ____
Do you need to say “git submodule update” as well?____
Could this be documented in the (upcoming?) workflows page?____
Thanks____
Simon____
__ __
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org mailto:ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs
_______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs
participants (3)
-
Johan Tibell
-
Simon Marlow
-
Simon Peyton Jones