Re: Git, merging and rebasing

2011-05-05 Thread José Pedro Magalhães
Hi Manuel, What is then the right way to do things? It is not clear to me from Linus's email. Consider the ghc-generics branch scenario: - A couple of repos are branched (compiler, ghc-prim, and others), but not all. These other repos are just using the "master" branch; - Two people work on it sep

pgj-freebsd-amd64-stable (amd64 FreeBSD STABLE), build 233, Success

2011-05-05 Thread Builder
pgj-freebsd-amd64-stable (amd64 FreeBSD STABLE), build 233 Build succeeded Details: http://darcs.haskell.org/ghcBuilder/builders/pgj-freebsd-amd64-stable/233.html git clone | Success create mk/build.mk| Success get subrepos | Success setting version date

[nightly] 05-May-2011 build of STABLE on i386-unknown-linux (cam-02-unx)

2011-05-05 Thread GHC Build Reports
Build description = STABLE on i386-unknown-linux (cam-02-unx) Build location= /playpen/simonmar/nightly/STABLE Build config file = /home/simonmar/nightly/site/msrc/conf-STABLE-cam-02-unx Nightly build started on cam-02-unx at Thu May 5 18:10:02 BST 2011. checking out new source tree

pgj-freebsd-i386-stable (x86 FreeBSD STABLE), build 216, Success

2011-05-05 Thread Builder
pgj-freebsd-i386-stable (x86 FreeBSD STABLE), build 216 Build succeeded Details: http://darcs.haskell.org/ghcBuilder/builders/pgj-freebsd-i386-stable/216.html git clone | Success create mk/build.mk| Success get subrepos | Success setting version date | S

[nightly] 05-May-2011 build of HEAD on i386-unknown-linux (cam-02-unx)

2011-05-05 Thread GHC Build Reports
Build description = HEAD on i386-unknown-linux (cam-02-unx) Build location= /playpen/simonmar/nightly/HEAD Build config file = /home/simonmar/nightly/site/msrc/conf-HEAD-cam-02-unx Nightly build started on cam-02-unx at Thu May 5 18:00:02 BST 2011. checking out new source tree

pgj2 (amd64 FreeBSD HEAD), build 351, Success

2011-05-05 Thread Builder
pgj2 (amd64 FreeBSD HEAD), build 351 Build succeeded Details: http://darcs.haskell.org/ghcBuilder/builders/pgj2/351.html git clone | Success create mk/build.mk| Success get subrepos | Success setting version date | Success booting | Succ

pgj (x86 FreeBSD HEAD), build 353, Success

2011-05-05 Thread Builder
pgj (x86 FreeBSD HEAD), build 353 Build succeeded Details: http://darcs.haskell.org/ghcBuilder/builders/pgj/353.html git clone | Success create mk/build.mk| Success get subrepos | Success setting version date | Success booting | Success

Re: [commit: ghc] master: Implement dead basic block elimination. (50f5c84)

2011-05-05 Thread Edward Z. Yang
Fixed up in 246183c669a1e851ccc4 Edward Excerpts from Simon Marlow's message of Thu May 05 08:57:10 -0400 2011: > On 30/04/2011 15:18, Edward Z. Yang wrote: > > Repository : ssh://darcs.haskell.org//srv/darcs/ghc > > > > On branch : master > > > > http://hackage.haskell.org/trac/ghc/changeset/50

Git, merging and rebasing

2011-05-05 Thread Manuel M T Chakravarty
There seems to be quite a bit of merging from master into branches going on in the GHC repos at the moment. This isn't necessarily a good way of using Git as Linus explains in this message: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html The way I understand it is t

[nightly] 05-May-2011 build of STABLE on x86_64-unknown-linux (cam-04-unx)

2011-05-05 Thread GHC Build Reports
Build description = STABLE on x86_64-unknown-linux (cam-04-unx) Build location= /64playpen/simonmar/nightly/STABLE-cam-04-unx Build config file = /home/simonmar/nightly/site/msrc/conf-STABLE-cam-04-unx Nightly build started on cam-04-unx at Thu May 5 18:10:01 BST 2011. checking out new so

kgardas-opensolaris-x86-head (x86 Solaris HEAD), build 223, Success

2011-05-05 Thread Builder
kgardas-opensolaris-x86-head (x86 Solaris HEAD), build 223 Build succeeded Details: http://darcs.haskell.org/ghcBuilder/builders/kgardas-opensolaris-x86-head/223.html git clone | Success create mk/build.mk| Success get subrepos | Success setting version date

[nightly] 05-May-2011 build of HEAD on x86_64-unknown-linux (cam-04-unx)

2011-05-05 Thread GHC Build Reports
Build description = HEAD on x86_64-unknown-linux (cam-04-unx) Build location= /64playpen/simonmar/nightly/HEAD-cam-04-unx Build config file = /home/simonmar/nightly/site/msrc/conf-HEAD-cam-04-unx Nightly build started on cam-04-unx at Thu May 5 18:00:01 BST 2011. checking out new source t

tn23 (x86 OSX HEAD), build 329, Failure

2011-05-05 Thread Builder
tn23 (x86 OSX HEAD), build 329 Build failed Details: http://darcs.haskell.org/ghcBuilder/builders/tn23/329.html git clone | Success create mk/build.mk | Success get subrepos | Failure: Just (ExitFailure 2) Build failed Details: http://darcs.haskell.org/ghcBuilder/builders/tn23/329

[commit: ghc] master: Improve dead block calculation, per Simon Marlow's advice. (246183c)

2011-05-05 Thread Edward Z. Yang
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/246183c669a1e851ccc42697dbbf309292bf2a08 >--- commit 246183c669a1e851ccc42697dbbf309292bf2a08 Author: Edward Z. Yang

sparky-unreg (Sparc Solaris unreg HEAD), build 111, Failure

2011-05-05 Thread Builder
sparky-unreg (Sparc Solaris unreg HEAD), build 111 Build failed Details: http://darcs.haskell.org/ghcBuilder/builders/sparky-unreg/111.html git clone | Failure: Just (ExitFailure 9) Build failed Details: http://darcs.haskell.org/ghcBuilder/builders/sparky-unreg/111.html ld.so.1: git: fatal: rel

[nightly] DPH Performance Test Succeeded

2011-05-05 Thread DPH Buildbot
Full logs at http://log.ouroborus.net/limitingfactor/dph Environment Platform host: limitingfactor.cse.unsw.EDU.AU arch: i386 processor: i386 system:Darwin 10.7.0 Versions GHC The Glorious Glasgow Haskell Compilation System, version 7.0.3 GCC i686-apple-da

Re: [commit: ghc] master: Implement dead basic block elimination. (50f5c84)

2011-05-05 Thread Simon Marlow
On 30/04/2011 15:18, Edward Z. Yang wrote: Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/50f5c8491bfcb6b891f772e2915443dbb5078e97 --- commit 50f5c8491bfcb6b891

Re: [commit: testsuite] master: Add TEST_HC_OPTS to every Makefile invocation of TEST_HC (6c0200b)

2011-05-05 Thread Simon Marlow
On 30/04/2011 14:03, Ian Lynagh wrote: On Thu, Apr 21, 2011 at 01:05:18AM -0700, Simon Peyton-Jones wrote: Still to come (I don't know how to do these) * The invocations of TEST_HC via cabal are not treated (eg cabal01, cabal04), and they should be I've just pushed a patch t

Re: patches for building a cross-compiling GHC

2011-05-05 Thread Simon Marlow
On 29/04/2011 20:09, Ian Lynagh wrote: On Fri, Apr 15, 2011 at 01:00:28PM -0700, Mark Lentczner wrote: My patches have been cleaned up and are available at git://github.com/mtnviewmark/ghc.git in the *cross* branch Thanks! I applied some, and fixed others in a different way. Everything shoul

[commit: ghc] ghc-generics: Do not enable -XGenerics when building the optimized libs. (54ca48a)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/54ca48a98d49f21bb485241e85ed473236420b6d >--- commit 54ca48a98d49f21bb485241e85ed473236420b6d Author: Jose Pedr

[commit: ghc] ghc-generics: Remove comment mentioning the old generic classes. (9b08b5f)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/9b08b5ff73fdc868ea2e3794570f9a1f6af51673 >--- commit 9b08b5ff73fdc868ea2e3794570f9a1f6af51673 Author: Jose Pedr

[commit: ghc] ghc-generics: Update the User Guide with generics stuff. (8670207)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/8670207566dcb8aad067e963b77a3fa1dc5b5111 >--- commit 8670207566dcb8aad067e963b77a3fa1dc5b5111 Author: Jose Pedr

[commit: ghc] ghc-generics: Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics (b507042)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/b5070429b2d284107b828da0cd45e5eb69128b6b >--- commit b5070429b2d284107b828da0cd45e5eb69128b6b Merge: 54ca48a...

[commit: testsuite] master: Test Trac #4851 (271b3d3)

2011-05-05 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master http://hackage.haskell.org/trac/ghc/changeset/271b3d3644f383b9e6a0a8e1afd7559da010cef6 >--- commit 271b3d3644f383b9e6a0a8e1afd7559da010cef6 Author: Simon Pey

[commit: ghc] ghc-generics: Invert sense of "why" error messages, so that "or" means "or" (fbf4bc1)

2011-05-05 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/fbf4bc17c752e1d1a3db5094ff02fa65e9746325 >--- commit fbf4bc17c752e1d1a3db5094ff02fa65e9746325 Author: Simon Pey

[commit: ghc] ghc-generics: Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics (858cdd2)

2011-05-05 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/858cdd2f2725c75d35dabf7411dbafa932d84095 >--- commit 858cdd2f2725c75d35dabf7411dbafa932d84095 Merge: fbf4bc1...

[commit: ghc] ghc-generics: Fix a previous incorrect merge. (0d3a6d5)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/0d3a6d5371e6f7a739a9b03ece6d72eb8a3803c7 >--- commit 0d3a6d5371e6f7a739a9b03ece6d72eb8a3803c7 Author: Jose Pedr

[commit: ghc] ghc-generics's head updated: Fix a previous incorrect merge. (0d3a6d5)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc Branch 'ghc-generics' now includes: 478e69b... Preliminary monad-comprehension patch (Trac #4370) 5ccf658... Merge remote branch 'origin/master' into monad-comp 4ac2bb3... Simon's hacking on monad-comp; incomplete d76d963...

[commit: ghc] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics (ea94a66)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/ea94a66d93047a9b0cd4532645eb1e9be04888e1 >--- commit ea94a66d93047a9b0cd4532645eb1e9be04888e1 Merge: ffabe3a...

[commit: ghc] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics (ffabe3a)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6 >--- commit ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6 Merge: fed2522...

[commit: testsuite] ghc-generics's head updated: Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics (bdad395)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite Branch 'ghc-generics' now includes: e560a17... monad comprehensions: test suite 6b80a5b... Modify tests, mostly adding -XTranformListComp af0b4b8... Add test for too many/few args in higher order situation 3ff1ad5... Te

[commit: testsuite] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics (bdad395)

2011-05-05 Thread José Pedro Magalhães
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-generics http://hackage.haskell.org/trac/ghc/changeset/bdad3951330c9f4123f7b87342c515c346d8892c >--- commit bdad3951330c9f4123f7b87342c515c346d8892c Merge: 5591