New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
x/tools: rewrite git history to remove accidental merge commit #43628
Comments
/cc @golang/release |
We needed to rewrite the history of x/tools master branch so that the This is now done. The previous master commit golang/tools@e2f9c7f was replaced with commit golang/tools@1b1bb64, which prunes the merge CL and its revert but keeping the tree content unmodified. Here's the complete log of how the rewrite was generated, for posterity:
Notably:
This issue is resolved now, and doing go get of the latest master commit (directly to VCS, bypassing module mirror for testing purposes) gives a v0.0.0 pseudo-version:
In order to keep the previously published x/tools pseudo-versions valid, we created a new branch This works too:
I'll send a mail to golang-dev@ to notify anyone working on x/tools that a rewritten history is expected. No CLs were dropped during the rewrite and force push, so nothing needs to be re-sent. Closing. |
One more for #26201. |
Over the holidays, I accidentally merged golang/tools@2152f4e and then tried to revert it with golang/tools@6375436. This caused the
gopls
pseudoversions to start withv0.6.2
rather thanv0.0.0
as before. We need to rewrite the Git history to remove these commits and restore the original pseudoversions.The text was updated successfully, but these errors were encountered: