spj-wildcard-refactor
Status on my spj-wildcard-refactor patch · I’m down to one test failure a modest perf regression on T3064. This is really a test of type family reduction which is nothing to do with my changes, so I have no idea what’s happening there. I’m waiting till I can build a profiled compiler to test. What’s the best workflow for to take my branch with tons of wibble-ish patches, and commit to HEAD with a small number of sensible patches. I was thinking: · Git checkout wip/spj-wildcard-refactor · Git merge master · Git reset master (leaves working files alone) · Now commit patches Is that right? Simon ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: spj-wildcard-refactor
I would imagine git pull # Get master up to date git checkout wip/spj-wildcard-refactor git rebase -i master The -i will let you flatten commits See https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history Alan On Fri, Nov 20, 2015 at 7:14 PM, Simon Peyton Jones <simo...@microsoft.com> wrote: > Status on my spj-wildcard-refactor patch > > · I’m down to one test failure a modest perf regression on T3064. > This is really a test of type family reduction which is nothing to do > with my changes, so I have no idea what’s happening there. I’m waiting > till I can build a profiled compiler to test. > > > > What’s the best workflow for to take my branch with tons of wibble-ish > patches, and commit to HEAD with a small number of sensible patches. > > > > I was thinking: > > · Git checkout wip/spj-wildcard-refactor > > · Git merge master > > · Git reset master (leaves working files alone) > > · Now commit patches > > Is that right? > > > > Simon > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: spj-wildcard-refactor
IMO, reset is a fine way to do this if you don't care about any of this history. But Simon, you should use 'git reset --soft master' so that you don't have to re-add any new files (if you have any!). Edward Excerpts from Alan & Kim Zimmerman's message of 2015-11-20 09:42:26 -0800: > I would imagine > > git pull # Get master up to date > git checkout wip/spj-wildcard-refactor > git rebase -i master > > The -i will let you flatten commits > > See > https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history > > Alan > > On Fri, Nov 20, 2015 at 7:14 PM, Simon Peyton Jones <simo...@microsoft.com> > wrote: > > > Status on my spj-wildcard-refactor patch > > > > · I’m down to one test failure a modest perf regression on T3064. > > This is really a test of type family reduction which is nothing to do > > with my changes, so I have no idea what’s happening there. I’m waiting > > till I can build a profiled compiler to test. > > > > > > > > What’s the best workflow for to take my branch with tons of wibble-ish > > patches, and commit to HEAD with a small number of sensible patches. > > > > > > > > I was thinking: > > > > · Git checkout wip/spj-wildcard-refactor > > > > · Git merge master > > > > · Git reset master (leaves working files alone) > > > > · Now commit patches > > > > Is that right? > > > > > > > > Simon > > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Wildcard refactor
Alan I'm really close on wip/spj-wildcard-refactor, that I really want to get into HEAD asap. Could you possibly checkout wip/spj-wildcard-refactor, and validate? I get two failures I don't understand: ghc-api/annotations listcomps [bad stdout] (normal) ghc-api/landmineslandmines [bad stderr] (normal) The output is not wildly different but I just don't know how to interpret it, so I don't even know what the problem is exactly. NB: you''ll need to do a 'git submodule update' because the haddock submodule changes. Thank you! Simon ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
RE: Wildcard refactor
It does, yes. It’s on 0d157fe, which is the head of wip/spj-wildcard-refactor in the haddock repo Is that what get checked out by ‘git submodule update”? Simon From: Alan & Kim Zimmerman [mailto:alan.z...@gmail.com] Sent: 18 November 2015 10:57 To: Simon Peyton Jones Subject: Re: Wildcard refactor I found the haddock library did not compile, but I am skipping straight to the tests. Does it compile for you at the moment? On Wed, Nov 18, 2015 at 12:51 PM, Simon Peyton Jones <simo...@microsoft.com<mailto:simo...@microsoft.com>> wrote: Thank you! From: Alan & Kim Zimmerman [mailto:alan.z...@gmail.com<mailto:alan.z...@gmail.com>] Sent: 18 November 2015 10:04 To: Simon Peyton Jones Cc: ghc-devs@haskell.org<mailto:ghc-devs@haskell.org> Subject: Re: Wildcard refactor ok. I have been waiting to jump in and help. Alan On Wed, Nov 18, 2015 at 12:02 PM, Simon Peyton Jones <simo...@microsoft.com<mailto:simo...@microsoft.com>> wrote: Alan I’m really close on wip/spj-wildcard-refactor, that I really want to get into HEAD asap. Could you possibly checkout wip/spj-wildcard-refactor, and validate? I get two failures I don’t understand: ghc-api/annotations listcomps [bad stdout] (normal) ghc-api/landmineslandmines [bad stderr] (normal) The output is not wildly different but I just don’t know how to interpret it, so I don’t even know what the problem is exactly. NB: you’’ll need to do a ‘git submodule update’ because the haddock submodule changes. Thank you! Simon ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
RE: Wildcard refactor
Oh sorry, no I think I’d been skipping it too. I’ll fix that! Meanwhile, skip! From: ghc-devs [mailto:ghc-devs-boun...@haskell.org] On Behalf Of Simon Peyton Jones Sent: 18 November 2015 11:18 To: Alan & Kim Zimmerman Cc: ghc-devs@haskell.org Subject: RE: Wildcard refactor It does, yes. It’s on 0d157fe, which is the head of wip/spj-wildcard-refactor in the haddock repo Is that what get checked out by ‘git submodule update”? Simon From: Alan & Kim Zimmerman [mailto:alan.z...@gmail.com] Sent: 18 November 2015 10:57 To: Simon Peyton Jones Subject: Re: Wildcard refactor I found the haddock library did not compile, but I am skipping straight to the tests. Does it compile for you at the moment? On Wed, Nov 18, 2015 at 12:51 PM, Simon Peyton Jones <simo...@microsoft.com<mailto:simo...@microsoft.com>> wrote: Thank you! From: Alan & Kim Zimmerman [mailto:alan.z...@gmail.com<mailto:alan.z...@gmail.com>] Sent: 18 November 2015 10:04 To: Simon Peyton Jones Cc: ghc-devs@haskell.org<mailto:ghc-devs@haskell.org> Subject: Re: Wildcard refactor ok. I have been waiting to jump in and help. Alan On Wed, Nov 18, 2015 at 12:02 PM, Simon Peyton Jones <simo...@microsoft.com<mailto:simo...@microsoft.com>> wrote: Alan I’m really close on wip/spj-wildcard-refactor, that I really want to get into HEAD asap. Could you possibly checkout wip/spj-wildcard-refactor, and validate? I get two failures I don’t understand: ghc-api/annotations listcomps [bad stdout] (normal) ghc-api/landmineslandmines [bad stderr] (normal) The output is not wildly different but I just don’t know how to interpret it, so I don’t even know what the problem is exactly. NB: you’’ll need to do a ‘git submodule update’ because the haddock submodule changes. Thank you! Simon ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Wildcard refactor
This is what I get locally unexpected results from: TEST="landmines listcomps T7861 T5837 T4896 T3064" OVERALL SUMMARY for test run started at Wed Nov 18 10:48:00 2015 UTC 0:27:16 spent to go through 4802 total tests, which gave rise to 18143 test cases, of which 13285 were skipped 77 had missing libraries 4667 expected passes 108 expected failures 0 caused framework failures 0 unexpected passes 5 unexpected failures 1 unexpected stat failures Unexpected failures: deriving/should_compile T4896 [exit code non-0] (normal) ghc-api/annotations listcomps [bad stdout] (normal) ghc-api/landmineslandmines [bad stderr] (normal) perf/compilerT5837 [stderr mismatch] (normal) typecheck/should_run T7861 [bad stderr] (normal) Unexpected stat failures: perf/compiler T3064 [stat not good enough] (normal) I will look into the two ghc-api ones. On Wed, Nov 18, 2015 at 1:19 PM, Simon Peyton Jones <simo...@microsoft.com> wrote: > Oh sorry, no I think I’d been skipping it too. I’ll fix that! Meanwhile, > skip! > > > > *From:* ghc-devs [mailto:ghc-devs-boun...@haskell.org] *On Behalf Of *Simon > Peyton Jones > *Sent:* 18 November 2015 11:18 > *To:* Alan & Kim Zimmerman > *Cc:* ghc-devs@haskell.org > *Subject:* RE: Wildcard refactor > > > > It does, yes. It’s on 0d157fe, which is the head of > wip/spj-wildcard-refactor in the haddock repo > > Is that what get checked out by ‘git submodule update”? > > > > Simon > > > > *From:* Alan & Kim Zimmerman [mailto:alan.z...@gmail.com > <alan.z...@gmail.com>] > *Sent:* 18 November 2015 10:57 > *To:* Simon Peyton Jones > *Subject:* Re: Wildcard refactor > > > > I found the haddock library did not compile, but I am skipping straight to > the tests. > > Does it compile for you at the moment? > > > > On Wed, Nov 18, 2015 at 12:51 PM, Simon Peyton Jones < > simo...@microsoft.com> wrote: > > Thank you! > > > > *From:* Alan & Kim Zimmerman [mailto:alan.z...@gmail.com] > *Sent:* 18 November 2015 10:04 > *To:* Simon Peyton Jones > *Cc:* ghc-devs@haskell.org > *Subject:* Re: Wildcard refactor > > > > ok. > > I have been waiting to jump in and help. > > Alan > > > > On Wed, Nov 18, 2015 at 12:02 PM, Simon Peyton Jones < > simo...@microsoft.com> wrote: > > Alan > > I’m really close on wip/spj-wildcard-refactor, that I really want to get > into HEAD asap. > > Could you possibly checkout wip/spj-wildcard-refactor, and validate? I > get two failures I don’t understand: > >ghc-api/annotations listcomps [bad stdout] (normal) > >ghc-api/landmineslandmines [bad stderr] (normal) > > The output is not wildly different but I just don’t know how to interpret > it, so I don’t even know what the problem is exactly. > > NB: you’’ll need to do a ‘git submodule update’ because the haddock > submodule changes. > > Thank you! > > Simon > > > > > > > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
Re: Wildcard refactor
ok. I have been waiting to jump in and help. Alan On Wed, Nov 18, 2015 at 12:02 PM, Simon Peyton Jones <simo...@microsoft.com> wrote: > Alan > > I’m really close on wip/spj-wildcard-refactor, that I really want to get > into HEAD asap. > > Could you possibly checkout wip/spj-wildcard-refactor, and validate? I > get two failures I don’t understand: > >ghc-api/annotations listcomps [bad stdout] (normal) > >ghc-api/landmineslandmines [bad stderr] (normal) > > The output is not wildly different but I just don’t know how to interpret > it, so I don’t even know what the problem is exactly. > > NB: you’’ll need to do a ‘git submodule update’ because the haddock > submodule changes. > > Thank you! > > Simon > > > ___ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
