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

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

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

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

pgj2 (amd64 FreeBSD HEAD), build 352, Success

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

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

2011-05-06 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 Fri May 6 18:10:01 BST 2011. checking out new source tree

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

2011-05-06 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 Fri May 6 18:00:01 BST 2011. checking out new source tree

pgj (x86 FreeBSD HEAD), build 354, Success

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

tn23 (x86 OSX HEAD), build 330, Success

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

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

2011-05-06 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 Fri May 6 18:10:01 BST 2011. checking out new so

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

2011-05-06 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 Fri May 6 18:00:01 BST 2011. checking out new source t

Re: Git, merging and rebasing

2011-05-06 Thread Ian Lynagh
On Fri, May 06, 2011 at 01:50:29PM -0700, David Terei wrote: > The way I work which I think works well is: This seems to me like a lot of effort, and a lot of potential for people to get in a muddle, just to avoid some harmless merge commits. Thanks Ian

Re: Git, merging and rebasing

2011-05-06 Thread David Terei
The way I work which I think works well is: 1) While developing, do whatever you feel like in your branch. So lots of merge commits are fine since as pointed out, rebasing can make multi party collaboration a little difficult at times. 2) When a point is reached where you want to push some work u

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

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

Re: Git, merging and rebasing

2011-05-06 Thread Isaac Dupree
On 05/06/11 05:15, Simon Peyton-Jones wrote: So I think merging the master onto the branch must be done regularly not as a big bang at the end. If someone would like to write a duffers guide describing how to do that, I'm happy to follow it. But the only way I understand is to merge master on

[commit: testsuite] ghc-new-co's head updated: One more error message (39d470f)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite Branch 'ghc-new-co' now includes: ec54019... Test Trac #5084 353731f... Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics 53b30fa... Adapting the testsuite for the new generic deriving mechanism.

[commit: testsuite] ghc-new-co: One more error message (39d470f)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/39d470f1c2bc5ee1ded772d39cab2abf5e0cf6b4 >--- commit 39d470f1c2bc5ee1ded772d39cab2abf5e0cf6b4 Author: Simon

[commit: testsuite] ghc-new-co: Test Trac #5168 (d1f0d1d)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/d1f0d1da9bfabd751e8a67aa0564e7335bd29a8d >--- commit d1f0d1da9bfabd751e8a67aa0564e7335bd29a8d Author: Simon

[commit: testsuite] ghc-new-co: Merge remote branch 'origin/master' into ghc-new-co (24fe576)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/24fe57678aae77c8b6022de4b8ca5d703bb0143e >--- commit 24fe57678aae77c8b6022de4b8ca5d703bb0143e Merge: a09323

[commit: testsuite] ghc-new-co: Track error message changes (a09323f)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/a09323f41840b624b2a69d57ab94336279ca534f >--- commit a09323f41840b624b2a69d57ab94336279ca534f Author: Simon

[commit: ghc] ghc-new-co's head updated: Fix build (fe58dd2)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc Branch 'ghc-new-co' now includes: 39bb1bd... Merge branch 'master' into ghc-new-co 15bea1b... Comment changes to satisfy Haddock 478e69b... Preliminary monad-comprehension patch (Trac #4370) 5ccf658... Merge remote branch 'or

[commit: ghc] ghc-new-co: Fix build (fe58dd2)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/fe58dd2f091f5a4a0e83a5ec6da643a6711e3aed >--- commit fe58dd2f091f5a4a0e83a5ec6da643a6711e3aed Author: Simon Peyto

[commit: ghc] ghc-new-co: Merge master into the ghc-new-co branch (ca53c38)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/ca53c38335cdc671f0b1e0949aa1514fc3fd72a5 >--- commit ca53c38335cdc671f0b1e0949aa1514fc3fd72a5 Merge: 4f8d714... 2

[commit: ghc] ghc-new-co: Substantial improvements in RtClosureInspect (4f8d714)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/4f8d714962667c219de4e684fe069136a0f78729 >--- commit 4f8d714962667c219de4e684fe069136a0f78729 Author: Simon Peyto

[commit: ghc] ghc-new-co: Missing coercion case in byte code generation (668ac80)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/668ac8061c35fd5b72816fd3c4dd4881c46db737 >--- commit 668ac8061c35fd5b72816fd3c4dd4881c46db737 Author: Simon Peyto

[commit: ghc] ghc-new-co: Remove special case for EqPred in CoreView (abfa45f)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/abfa45f26f9a5d2bc67b18b7820e0b4039f12ad3 >--- commit abfa45f26f9a5d2bc67b18b7820e0b4039f12ad3 Author: Simon Peyto

[commit: ghc] ghc-new-co: Be cleverer in dataConCannotMatch, fixes Trac #5168 (a10a21d)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/a10a21dadac041e928ad5dab3810b68ab35bc9bb >--- commit a10a21dadac041e928ad5dab3810b68ab35bc9bb Author: Simon Peyto

[commit: ghc] ghc-new-co: Use eqSpecPreds (ee62a1b)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/ee62a1b6847e42f76383b2e70003f2feb9e8435c >--- commit ee62a1b6847e42f76383b2e70003f2feb9e8435c Author: Simon Peyto

[commit: ghc] ghc-new-co: Merge commit (5096055)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/5096055e9aa46a7cc8b5a1292f7094fe588ec4d1 >--- commit 5096055e9aa46a7cc8b5a1292f7094fe588ec4d1 Merge: db4f42a... b

[commit: ghc] ghc-new-co: Comment changes to satisfy Haddock (15bea1b)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/15bea1b740be3d5ee755e0e7a7b214b587ad2205 >--- commit 15bea1b740be3d5ee755e0e7a7b214b587ad2205 Author: Simon Peyto

[commit: ghc] ghc-new-co: Merge in changes from HEAD (db4f42a)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/db4f42a8e38bfead11f5af78557e18b9f42b10b3 >--- commit db4f42a8e38bfead11f5af78557e18b9f42b10b3 Merge: 15bea1b... 2

[commit: ghc] ghc-new-co: Merge branch 'master' into ghc-new-co (39bb1bd)

2011-05-06 Thread Simon Peyton Jones
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co http://hackage.haskell.org/trac/ghc/changeset/39bb1bd24f56d1abd9961813d9cd94b61c9d4c78 >--- commit 39bb1bd24f56d1abd9961813d9cd94b61c9d4c78 Merge: fdf8656... 4

[nightly] DPH Performance Test Succeeded

2011-05-06 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: Git, merging and rebasing

2011-05-06 Thread Manuel M T Chakravarty
Simon Marlow: > On 06/05/11 02:05, Manuel M T Chakravarty wrote: >> 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

RE: Git, merging and rebasing

2011-05-06 Thread Simon Peyton-Jones
It's a long message and I don't understand it. Suppose we have * A branch * Shared between several people * Long-lived (weeks not day) how should we manage it? It *must* be possible to merge fixes from the master into the branch. Doing so, and then validating, is essential because (as we have p

Re: Git, merging and rebasing

2011-05-06 Thread Simon Marlow
On 06/05/11 02:05, Manuel M T Chakravarty wrote: 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.