Re: MR does not merge

16 Jan 2019

      The problem is with the different platforms that need to be tested. I could
see this getting stuck in an infinite retest and rebase loop because you
have to wait on different builds to finish not just one.

So I think this is a harder problem to solve than we're making it out to
be. The system needs some concept of fairness and prevention of this retry
cycle. And you can't not retest the patch after a rebase as the
functionality of the already merged patch may be conflicting.

I imagine the bit cannot serialize all testing on all platforms otherwise
the slowest platform becomes the problem.

On Wed, Jan 16, 2019, 15:20 Evan Laforge  wrote:
...
At work we use "marge bot", https://github.com/smarkets/marge-bot
which is an automatic bot that will do the rebase and resubmit thing.
I think it's pretty essential, because otherwise any intervening merge
means you have to babysit the merge button.  It's also more efficient
if you have expensive CI, because it serializes the runs.
BTW, I've extended marge with a "try rebase, then try merge" strategy,
which is useful if people merge from head, and a "merge CI run" which
is useful if you have an expensive CI you want to run only on merge,
not on every single branch push.
On Wed, Jan 16, 2019 at 10:56 PM Matthew Pickering
 wrote:
...
There is problem with the interaction between "merge when validated"
and "fast forward merge only" option.
If anyone commits to master between clicking the button and validation
finishing then the merge will fail as the patch needs to be rebased
before it can be merged.
I'm not sure what the plan to deal with this is.
On Wed, Jan 16, 2019 at 2:49 PM Simon Peyton Jones via ghc-devs
 wrote:
...
Ben
Six days ago I submitted this MR
https://gitlab.haskell.org/ghc/ghc/merge_requests/109
Just tiny refactorings.  I said “merge when validated”
But six days later, it still appears not to have merged.  What’s up?
I was expecting it to merge in a matter of an hour or two.
...
...
Thanks
Simon
_______________________________________________
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
_______________________________________________
ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

ghc-devs mailing list
ghc-devs@haskell.org
http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs

Re: MR does not merge

Phyx