Re: Cloning ghc-7.8

2014-04-24 Thread Johan Tibell
On Thu, Apr 24, 2014 at 12:38 PM, Simon Peyton Jones
wrote:

> That seems a bit extreme.  I thought switching branches is precisely what
> git is good at.
>

It was made not so great in the past (i.e. 7.8) by us having the homegrown
sync-all pull system instead of submodules.
___
ghc-devs mailing list
ghc-devs@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-devs


Re: Cloning ghc-7.8

2014-04-24 Thread Herbert Valerio Riedel
On 2014-04-24 at 12:38:40 +0200, Simon Peyton Jones wrote:
> OK.  So are you saying that you can't reliably change to a different
> branch in an existing tree, but rather must freshly clone from the
> source each time you want to check out a different branch?
>
> That seems a bit extreme.  I thought switching branches is precisely
> what git is good at.

In all fairness, you made it sound (e.g. Subject-line) as if you wanted
to know how to *clone* a GHC 7.8 branch rather than switching to the
ghc-7.8 branch... :-)

That said, however: Yes, switching between the 'ghc-7.8' branch and
'master' is currently problematic, because 'ghc-7.8' has a different mix
of submodules and loose subrepos than 'master', and the issue being that
Git isn't aware of that, so Git gets confused here and there, as it
doesn't have all information it needs.

This will get better however, once everything is put under Git's
control. Then switching between 'ghc-7.10' and GHC HEAD should work much
smoother than now between 'ghc-7.8' and GHC HEAD

Hope this makes some sense...
___
ghc-devs mailing list
ghc-devs@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-devs


RE: Cloning ghc-7.8

2014-04-24 Thread Simon Peyton Jones
OK.  So are you saying that you can't reliably change to a different branch in 
an existing tree, but rather must freshly clone from the source each time you 
want to check out a different branch?

That seems a bit extreme.  I thought switching branches is precisely what git 
is good at.

Still I'll blow away my tree and try what you say.

Simon

| -Original Message-
| From: Herbert Valerio Riedel [mailto:hvrie...@gmail.com]
| Sent: 24 April 2014 11:30
| To: Simon Peyton Jones
| Cc: Austin Seipp
| Subject: Re: Cloning ghc-7.8
| 
| On 2014-04-24 at 12:14:16 +0200, Simon Peyton Jones wrote:
| > I tried the sequence below and got this:
| 
| maybe try this sequence that was suggested by Austin on #ghc a couple
| of
| days ago:
| 
|  (sync-all has a little difficulty with the submodules
| here, and you'll end up needing to always clean anyway due to interface
| changes, etc)
|  'git clone -b ghc-7.8 git://git.haskell.org && cd ghc
| && ./sync-all get -b ghc-7.8' should do it
| 

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


RE: Cloning ghc-7.8

2014-04-24 Thread Simon Peyton Jones
I tried the sequence below and got this:

simonpj@cam-05-unx:~/code/ghc-7.8-branch$
 git checkout ghc-7.8

warning: unable to rmdir utils/haddock: Directory not empty

Mlibraries/Cabal

Mlibraries/binary

Mlibraries/vector

Branch ghc-7.8 set up to track remote branch ghc-7.8 from origin.

Switched to a new branch 'ghc-7.8'

simonpj@cam-05-unx:~/code/ghc-7.8-branch$ ls utils/haddock/

ANNOUNCE doc/   haddock.cabal haskell.vim  latex-test/  make-sdist.sh  
Setup.lhs*  test/

build-windows-dist.sh  driver/haddock.spec  hcar.tex LICENSE  
README   src/  vendor/

CHANGES  ghc.mk haddock.wrapper  html-test/   Makefile 
resources/   STYLE

simonpj@cam-05-unx:~/code/ghc-7.8-branch$ git submodule update

Submodule path 'libraries/Cabal': checked out 
'c226c0de042999bbe4c5c339c6c28a9be7f0c6d1'

Submodule path 'libraries/binary': checked out 
'2799c25d85b4627200f2e4dcb30d2128488780c3'

Submodule path 'libraries/vector': checked out 
'9baab444a57c4a225ee247fea27187d1892d90bf'

simonpj@cam-05-unx:~/code/ghc-7.8-branch$
Notice the bit in red, and the lack of a submodule update message with I did 
"git submodule update". This is a completely fresh tree, newly cloned from the 
main repo.
Thanks
Simon
From: ghc-devs [mailto:ghc-devs-boun...@haskell.org] On Behalf Of Simon Peyton 
Jones
Sent: 24 April 2014 09:23
To: ghc-devs@haskell.org
Subject: Cloning ghc-7.8

How would I get a GHC 7.8 branch repo?  Something like

git clone http://git.haskell.org/ghc.git ghc-7.8-branch

cd ghc-7.8-branch

./sync-all get

git checkout ghc-7.8

git submodule update
Is that enough?  What about the non-submodule libraries?  Do I need to do any 
more pull/get stuff?
This would be another great entry on the workflow page.
Thanks
Simon
___
ghc-devs mailing list
ghc-devs@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-devs