Hi, My patch 3358 needs to get merged before the 8.12 fork. When I finished it (in May), it passed CI and after this point I lacked time to work on it further. Now I have asked 4 times for this patch to get merged and it is still open. The GHC proposal for this patch already took an extortionate amount of time to get accepted. Please can we close this chapter by merging the patch. Cheers, Matt
Matthew It looks from https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3358 as if it was blocked on something to do with 'text'. Is that unblocked now? The MR also says "Fast forward merge is not possible". So it sounds as if the steps are: * Check that the change to text, whatever that is, has been done, and fix the text submodule commit on the MR * Rebase * Assign to Marge. If you get stuck with that, do yell. Simon | -----Original Message----- | From: ghc-devs <ghc-devs-bounces@haskell.org> On Behalf Of Matthew | Pickering | Sent: 20 July 2020 08:46 | To: GHC developers <ghc-devs@haskell.org> | Subject: Unmerged Patch: 3358 | | Hi, | | My patch 3358 needs to get merged before the 8.12 fork. | | When I finished it (in May), it passed CI and after this point I | lacked time to work on it further. Now I have asked 4 times for this | patch to get merged and it is still open. | | The GHC proposal for this patch already took an extortionate amount of | time to get accepted. Please can we close this chapter by merging the | patch. | | Cheers, | | Matt | _______________________________________________ | ghc-devs mailing list | ghc-devs@haskell.org | https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.has | kell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc- | devs&data=02%7C01%7Csimonpj%40microsoft.com%7Cc2cb1e33865c4972eaaf08d | 82c810934%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637308279999004717 | &sdata=TZc9lHJMlijCfhhhqWSLk8o46z5tosFz91LWAy9h1b8%3D&reserved=0
Matthew Pickering <matthewtpickering@gmail.com> writes:
Hi,
My patch 3358 needs to get merged before the 8.12 fork.
Yes, it is on my list. It is in fact one of the last two patches that need to be merged before we can fork. Unfotunately, it has conflicted a number of times and required a fair bit of manual rebasing, hence the wait. Cheers, - Ben
Ben, I am behind on some details, but if it is blocked on text, is there some way I can help? On Tue, Jul 21, 2020, 7:21 AM Ben Gamari <ben@smart-cactus.org> wrote:
Matthew Pickering <matthewtpickering@gmail.com> writes:
Hi,
My patch 3358 needs to get merged before the 8.12 fork.
Yes, it is on my list. It is in fact one of the last two patches that need to be merged before we can fork. Unfotunately, it has conflicted a number of times and required a fair bit of manual rebasing, hence the wait.
Cheers,
- Ben _______________________________________________ ghc-devs mailing list ghc-devs@haskell.org http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
On July 21, 2020 1:22:52 PM EDT, chessai <chessai1996@gmail.com> wrote:
Ben,
I am behind on some details, but if it is blocked on text, is there some way I can help?
I think we are all clear here; the text branch was merged and I have now merged !3358 to master. Cheers, - Ben -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
participants (5)
-
Ben Gamari -
Ben Gamari -
chessai -
Matthew Pickering -
Simon Peyton Jones