Skip to content
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

MR Process: Create a utility that reverts a release branch to its most recently published state #367

Open
zepumph opened this issue Oct 2, 2024 · 0 comments
Assignees

Comments

@zepumph
Copy link
Member

zepumph commented Oct 2, 2024

From #151 (comment):

Discussion from 10/10/19:

We talked about a different option from the original list. Instead, we are going to try a process change where when we encounter the case where a release branch has changes that have not yet been published, we decide whether or not to revert the changes and add back after a batch maintenance release or publish the maintenance release changes on top of them. This gives us the most flexibility without the challenges of changing version numbers or other aspects of our process. One drawback that was mentioned was that the maintenance versioning numbers could get confusing. For example, consider that you have a change sitting on 1.1.1-rc.1 that gets reverted for a batch maintenance patch that goes on 1.1.2-rc.1. The decision is that 1.1.1 will be dropped forever. The reverted changes will then go on 1.1.3-rc.1. This drawback was acceptable given the other considerations.

We are going to try this for now. If it becomes too troublesome we will revisit and investigate a more intensive change later.

TODOs for the future:

  1. We need an automated tool for handling the reverting. This covers many things, @jonathanolson will pick this up.

So I'm promoting this TODO item to a new issue, and closing the other. I don't think this is too high a priority, but may be useful to add on a rainy day in case we every have a VERY HIGH priority MR that needs to go out in a matter of hours or days.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants