Don't worry about the merge commit. On Jan 22, 2015 11:57 AM, "Simon Peyton Jones" wrote:

BOTHER!

I have no idea how my commit, which was meant to change two all.T files, also ended up adding libraries/haskell98.

I'll revert and re-commit.

I also inadvertently did 'git pull' rather than 'git pull --rebase' so there's a merge node too. But I don't know how to undo that, and probably no harm done.

Simon

| -----Original Message----- | From: ghc-commits [mailto:ghc-commits-bounces@haskell.org] On Behalf | Of git@git.haskell.org | Sent: 22 January 2015 09:41 | To: ghc-commits@haskell.org | Subject: [commit: ghc] master: 32-bit performance wibbles (387f1d1) | | Repository : ssh://git@git.haskell.org/ghc | | On branch : master | Link : | http://ghc.haskell.org/trac/ghc/changeset/387f1d1ec334788c3e891e9304d4 | 27bc804998f4/ghc | | >--------------------------------------------------------------- | | commit 387f1d1ec334788c3e891e9304d427bc804998f4 | Author: Simon Peyton Jones | Date: Tue Jan 20 17:31:13 2015 +0000 | | 32-bit performance wibbles | | Less for GHC, more for Haddock | | | >--------------------------------------------------------------- | | 387f1d1ec334788c3e891e9304d427bc804998f4 | libraries/{integer-simple => haskell98}/.gitignore | 0 | libraries/haskell98/Array.hs | 15 + | libraries/haskell98/Bits.hs | 8 + | libraries/haskell98/CError.hs | 8 + | libraries/haskell98/CForeign.hs | 7 + | libraries/haskell98/CPUTime.hs | 9 + | libraries/haskell98/CString.hs | 7 + | libraries/haskell98/CTypes.hs | 7 + | libraries/haskell98/Char.hs | 18 + | libraries/haskell98/Complex.hs | 11 + | libraries/haskell98/Directory.hs | 46 +++ | libraries/haskell98/ForeignPtr.hs | 7 + | libraries/haskell98/IO.hs | 74 ++++ | libraries/haskell98/Int.hs | 7 + | libraries/haskell98/Ix.hs | 10 + | libraries/haskell98/LICENSE | 28 ++ | libraries/haskell98/List.hs | 34 ++ | libraries/haskell98/Locale.hs | 17 + | libraries/haskell98/MarshalAlloc.hs | 7 + | libraries/haskell98/MarshalArray.hs | 7 + | libraries/haskell98/MarshalError.hs | 22 ++ | libraries/haskell98/MarshalUtils.hs | 7 + | libraries/haskell98/Maybe.hs | 16 + | libraries/haskell98/Monad.hs | 19 + | libraries/haskell98/Numeric.hs | 48 +++ | libraries/haskell98/Prelude.hs | 196 ++++++++++ | libraries/haskell98/Ptr.hs | 7 + | libraries/haskell98/Random.hs | 407 | +++++++++++++++++++++ | libraries/haskell98/Ratio.hs | 10 + | libraries/{integer-gmp => haskell98}/Setup.hs | 0 | libraries/haskell98/StablePtr.hs | 7 + | libraries/haskell98/Storable.hs | 7 + | libraries/haskell98/System.hs | 15 + | libraries/haskell98/Time.hs | 22 ++ | libraries/haskell98/Word.hs | 7 + | libraries/haskell98/changelog.md | 15 + | libraries/haskell98/haskell98.cabal | 86 +++++ | libraries/haskell98/prologue.txt | 9 + | testsuite/tests/perf/compiler/all.T | 7 +- | testsuite/tests/perf/haddock/all.T | 13 +- | 40 files changed, 1240 insertions(+), 7 deletions(-) | | Diff suppressed because of size. To see it, use: | | git diff-tree --root --patch-with-stat --no-color --find-copies- | harder --ignore-space-at-eol --cc | 387f1d1ec334788c3e891e9304d427bc804998f4 | _______________________________________________ | ghc-commits mailing list | ghc-commits@haskell.org | http://www.haskell.org/mailman/listinfo/ghc-commits _______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs