Use the current merge base between CE MR and EE MR
What does this MR do?
Quoting https://gitlab.com/gitlab-org/gitlab-ee/issues/7500#note_99673938
There's a bug I found during investigating https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7072#note_99669997
That merge request missed https://gitlab.com/gitlab-org/gitlab-ee/commit/177d847cf5c0ad9f282f599fbd5e9dafdc3b6289 therefore during rebasing, the schema file will cause conflicts. The commit was still lying on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7275 which wasn't landed on EE master yet, so it's expected.
However, what if we merge that commit into that merge request? This way, it should contain the commit we're missing. I tried this locally and it still didn't pass given the current implementation, and that's also expected because the script only cares
git merge-base ce/master ee/master.That shouldn't be the case though. What we really care is the current merge base, by current merge base it means the merge base between the CE MR and EE MR, and that would be
git merge-base ce_fetch_head ee_fetch_head.I tried to run this without merging that commit, it's expected to be the same as the regular merge base. However after merging that commit, it's different, and using the new merge-base it's passing.
This should be something we could fix here.
What are the relevant issue numbers?
Related to https://gitlab.com/gitlab-org/gitlab-ee/issues/7500 but can't completely fix it.