Looking for ideas: long time fork returning home

[justdave]

Select Topic Area

Question

Body

We have a 26 year old code base for an open source project. 14 years ago, a company forked it, and over 14 years made lots of improvements to it that we want upstream. About 5 years ago, a repo was created under our organization to house an experimental merge between that 9 year old (at the time) fork and upstream. 5 years later, that experiment is a success, and we're almost ready to release the result. What we would like to do is to move the main branch of the experimental repo to become the main branch of the primary repo. Pushing the branch to the primary repo isn't an issue. What I'm worried about is 5 years worth of commits that now link to the wrong pull requests. An experimental move to a branch other than main in the primary repo shows the PR links in the commits now go to that same PR number in the primary repo and not the one in the experimental one where they actually were. This is confusing because if you click the link you wind up on a completely unrelated PR.

Does anyone have any suggestions for a good way to deal with this?

There's no big secret to who we are, so I can give you concrete examples.

This is for the Bugzilla project.

Primary repo: https://github.com/bugzilla/bugzilla
Experimental repo: https://github.com/bugzilla/harmony
commit log from branch move test: https://github.com/bugzilla/bugzilla/commits/harmonytest/

If you click through some of the PRs (or even just hover them) on that harmonytest commit log, you can see that the PRs they link to are completely unrelated to the commit.

We plan to eventually archive the harmony repo, but it would still be there to link to.

Thanks for any ideas!