
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

Matthew Pickering
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
Matthew Pickering
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
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