Some tips for using git rebase and keeping your history clean

2011-04-06 Thread Johan Tibell
Hi all, Since we've now switched to git I though I share Linus' notes on rebasing for those of you who haven't seen them: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html The mail talks about when to use rebase and when not to. Johan ___

Re: Rebuilding ghc changes interface hashes?

2011-04-06 Thread Matthias Kilian
On Wed, Apr 06, 2011 at 12:40:45PM +0100, Ian Lynagh wrote: > compiler/stage2/build/Config.hs includes cBooterVersion, so if you boot > with a different version then you get different code => different ABI. > > We could just remove this. In theory, stage2 won't be affected by the > bootstrapping c

Re: Rebuilding ghc changes interface hashes?

2011-04-06 Thread Simon Marlow
On 06/04/2011 12:40, Ian Lynagh wrote: On Tue, Apr 05, 2011 at 08:51:52PM +0100, Simon Marlow wrote: On 05/04/11 17:51, Matthias Kilian wrote: On Tue, Apr 05, 2011 at 09:59:23PM +0530, Joachim Breitner wrote: Also, the initial upload was built using ghc-6.12.1, while the upload now is build wi

Re: -DDEBUG and testsuite

2011-04-06 Thread Simon Marlow
On 06/04/2011 14:02, Max Bolingbroke wrote: On 6 April 2011 12:04, Edward Z. Yang wrote: The ill fated commit I made yesterday was a partial attempt to address some of the problems: basically, it boils down to DEBUG blocks that induce extra debugging output that the test framework doesn't know

Re: -DDEBUG and testsuite

2011-04-06 Thread Max Bolingbroke
On 6 April 2011 12:04, Edward Z. Yang wrote: > The ill fated commit I made yesterday was a partial attempt to > address some of the problems: basically, it boils down to DEBUG > blocks that induce extra debugging output that the test framework > doesn't know about. You didn't used to get so many

Re: Rebuilding ghc changes interface hashes?

2011-04-06 Thread Ian Lynagh
On Tue, Apr 05, 2011 at 08:51:52PM +0100, Simon Marlow wrote: > On 05/04/11 17:51, Matthias Kilian wrote: > >On Tue, Apr 05, 2011 at 09:59:23PM +0530, Joachim Breitner wrote: > >>Also, the initial upload was built using ghc-6.12.1, while the upload > >>now is build with ghc-7.0.2. Given that it is

Re: -DDEBUG and testsuite

2011-04-06 Thread Edward Z. Yang
The ill fated commit I made yesterday was a partial attempt to address some of the problems: basically, it boils down to DEBUG blocks that induce extra debugging output that the test framework doesn't know about. I guess the correct thing to do is track all these places down individually and add c

Re: Rebuilding ghc changes interface hashes?

2011-04-06 Thread Simon Marlow
On 05/04/2011 23:14, Matthias Kilian wrote: On Tue, Apr 05, 2011 at 08:51:52PM +0100, Simon Marlow wrote: On Tue, Apr 05, 2011 at 09:59:23PM +0530, Joachim Breitner wrote: Also, the initial upload was built using ghc-6.12.1, while the upload now is build with ghc-7.0.2. Given that it is a two-s