Simon, your suggestion makes sense to me. We can have 3 pages that cover:

1. Fixing Bugs (/working-conventions/fixing-bugs)

2. Adding Features (/working-conventions/adding-features)

3. Merge request work-flow (New page e.g. (/working-conventions/merge-requests)

Then (1) and (2) would reference (3) and most of the content in /home would be moved to (3).

This leave one loose end: /home is left almost empty. I suggest we move contents of /contributing to /home, though I'm interested in hearing any alternative idea

- David E


On 5/23/19 12:24 PM, Simon Peyton Jones wrote:

Thanks 

 

* I've noted this in fixing-bugs and linked to home (I'm trying to avoid too much duplication between https://gitlab.haskell.org/ghc/ghc/wikis/working-conventions/fixing-bugs and https://gitlab.haskell.org/ghc/ghc/wikis/home)

 

I agree with avoiding duplication, but let’s fix that by fixing the home page. Why is there all this detail about merge requests there?  Let’s push all that off into a single integrated page “How to contribute a patch”.

 

The current “how to contribute a patch” page is really “how to fix a bug (including how to contribute a patch)”.  So maybe we should have:

both as pages of their own, but both pointing to a single pate

 

That would also de-clutter the home page.

 

Simon

 

From: David Eichmann <davide@well-typed.com>
Sent: 23 May 2019 12:10
To: Simon Peyton Jones <simonpj@microsoft.com>; Ben Gamari <ben@well-typed.com>
Cc: iavor.diatchki@gmail.com
Subject: Re: Processing MRs very slow?

 

I found the email you're referring to https://mail.haskell.org/pipermail/ghc-devs/2019-May/017656.html. You mentioned 3 points of missing information:

*   Picking approvers
       * Lets see how the "gitlab upgrade - change in approval system" email thread develops.
*   Assigning to Marge
       * I've noted this in fixing-bugs and linked to home (I'm trying to avoid too much duplication between https://gitlab.haskell.org/ghc/ghc/wikis/working-conventions/fixing-bugs and https://gitlab.haskell.org/ghc/ghc/wikis/home)
*   Monitoring progress if it doesn't land within 24 hrs; even knowing when to time out would help.
       * I've added some info in https://gitlab.haskell.org/ghc/ghc/wikis/home#merging-your-merge-request
 
Hope this is better now. Ben maybe you'd like to double check the bullet list in https://gitlab.haskell.org/ghc/ghc/wikis/home#merging-your-merge-request for the conditions under which marge will batch your MR.
 
- David E
 

On 5/23/19 9:02 AM, Simon Peyton Jones wrote:

| |  Perhaps it is worth updating Step 7 or 8 of
 
Yes, I suggested that to Ben a week or two ago, but he's flat out on incremental GC.
 
Maybe David could do it?  I can dig out the email.
 
Thanks!
 
Simon
 
|  -----Original Message-----
|  From: ghc-devs <ghc-devs-bounces@haskell.org> On Behalf Of Iavor Diatchki
|  Sent: 22 May 2019 23:49
|  To: David Eichmann <davide@well-typed.com>
|  Cc: ghc-devs <ghc-devs@haskell.org>
|  Subject: Re: Processing MRs very slow?
|  Great thanks!  How can I have a look at Marge-bot's queue?
|  Perhaps it is worth updating Step 7 or 8 of
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.h
|  askell.org%2Fghc%2Fghc%2Fwikis%2Fworking-conventions%2Ffixing-
|  bugs&amp;data=02%7C01%7Csimonpj%40microsoft.com%7Cc0e7235773dd4c553d8c08d6
|  df07cbb3%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636941621907873036&a
|  mp;sdata=gWoMbrHZwyfDQWeCst0VmAl4x%2Fv%2BjFY3dUXI7X%2FCHEQ%3D&amp;reserved
|  =0
|  to indicate that the reviewers should assign the MR to Marge-bot when it
|  is approved, and how one can check if that has happened.
|  On Wed, May 22, 2019 at 9:53 AM David Eichmann <davide@well-typed.com>
|  wrote:
|  >
|  > Recently there have been some issues with CI that has slowed down
|  > merging. In particular a performance test (T9630) was failing on CI.
|  > That is fixed now and as of today Marge-Bot seems to be merging MRs
|  > again. I'll continue to monitor this in the coming days.
|  >
|  > Iavor, your MR was approved but not assigned to Marge-bot, and so was
|  > not in the merge queue. I'm not sure who has permission to do this,
|  > but you can always ping the approvers. In this case I've assigned to
|  > Marge-bot for you, and it will hopefully be merge soon.
|  >
|  > David Eichmann
|  >
|  > On 5/22/19 5:09 PM, Iavor Diatchki wrote:
|  > > Hello,
|  > >
|  > > I made a gitlab MR that adds two NOINLINE pragmas and some comments.
|  > > It's been about a week since my last push to the MR, and nothing has
|  > > happened since.
|  > >
|  > > Is there a way to check on what is its status:
|  > >    - Is it stuck because I need to do something?
|  > >    - Is it stuck because someone else needs to do something?
|  > >    - Or is it just in the queue to be merged, in which case it would
|  > > be nice to know where in line it is, so I can see that there is
|  > > progress, and it is not just stuck.
|  > >
|  > > Given that this is such a simple MR, I am not too worried about
|  > > conflicts but a week long lag seems less than ideal for anything
|  > > even mildly complex.
|  > >
|  > > -Iavor
|  > >
|  > > PS: I just clicked on all the little check boxes from the
|  > > template---perhaps that's why things weren't progressing?
|  > > _______________________________________________
|  > > ghc-devs mailing list
|  > > ghc-devs@haskell.org
|  > > https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmai
|  > > l.haskell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-devs&amp;data=02%
|  > > 7C01%7Csimonpj%40microsoft.com%7Cc0e7235773dd4c553d8c08d6df07cbb3%7C
|  > > 72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636941621907873036&amp;sd
|  > > ata=W3wnIH%2F2oEmuqona%2Fk6NtoYUZsnFA1kun%2Blm%2BSGMIjo%3D&amp;reser
|  > > ved=0
|  >
|  > --
|  > David Eichmann, Haskell Consultant
|  > Well-Typed LLP,
|  > https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.w
|  > ell-typed.com&amp;data=02%7C01%7Csimonpj%40microsoft.com%7Cc0e7235773d
|  > d4c553d8c08d6df07cbb3%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636
|  > 941621907873036&amp;sdata=RIcEblo4xNED7UY6Vv%2FNIG4aAzcjLgzN8uegqX9K%2
|  > F3I%3D&amp;reserved=0
|  >
|  > Registered in England & Wales, OC335890
|  > 118 Wymering Mansions, Wymering Road, London W9 2NF, England
|  >
|  > _______________________________________________
|  > ghc-devs mailing list
|  > ghc-devs@haskell.org
|  > https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.
|  > haskell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-devs&amp;data=02%7C01
|  > %7Csimonpj%40microsoft.com%7Cc0e7235773dd4c553d8c08d6df07cbb3%7C72f988
|  > bf86f141af91ab2d7cd011db47%7C1%7C0%7C636941621907873036&amp;sdata=W3wn
|  > IH%2F2oEmuqona%2Fk6NtoYUZsnFA1kun%2Blm%2BSGMIjo%3D&amp;reserved=0
|  _______________________________________________
|  ghc-devs mailing list
ghc-devs@haskell.org
https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.hask
|  ell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-
|  devs&amp;data=02%7C01%7Csimonpj%40microsoft.com%7Cc0e7235773dd4c553d8c08d6
|  df07cbb3%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636941621907873036&a
|  mp;sdata=W3wnIH%2F2oEmuqona%2Fk6NtoYUZsnFA1kun%2Blm%2BSGMIjo%3D&amp;reserv
|  ed=0
-- 
David Eichmann, Haskell Consultant
Well-Typed LLP, http://www.well-typed.com
 
Registered in England & Wales, OC335890
118 Wymering Mansions, Wymering Road, London W9 2NF, England 
-- 
David Eichmann, Haskell Consultant
Well-Typed LLP, http://www.well-typed.com

Registered in England & Wales, OC335890
118 Wymering Mansions, Wymering Road, London W9 2NF, England