HEADS-UP: Folding in base, integer-{gmp, single}, ghc-prim, and haskell-template into ghc.git

[Simon Peyton Jones]

I would love a reply to this query.  Currently I don't dare do 'git pull' into my active working trees.

Specifically: what steps, if any, beyond 'git pull --rebase' do I need to do, to update my working trees.

Thanks

Simon


| -----Original Message-----
| From: Simon Peyton Jones
| Sent: 21 April 2014 09:34
| To: 'Herbert Valerio Riedel'; ghc-devs
| Subject: RE: HEADS-UP: Folding in base, integer-{gmp, single}, ghc-
| prim, and haskell-template into ghc.git
| 
| 
| | As there were no objections, I went on and implemented the change, so
| | as of
| |
| |
| |
| http://git.haskell.org/ghc.git/commit/41f5b7e3e0648302b9c5dc485917a391
| | d
| | 21d15a1
| |
| | the repositories mentioned above are now part of ghc.git, and the
| same
| | procedure applies as when we folded-in testsuite some time ago.
| 
| Great!  But what, specifically, is "the same procedure"?  That is, if I
| have an existing tree, what steps do I take to upgrade?
| 
| Never underestimate how stupid I am with git.
| 
| Thanks
| 
| Simon