mercurial: add a config knob to apply patches to the tip revision - #105
Merged
Merged
Conversation
Member
Author
|
I think the CI failure is unrelated here. Closes mozilla/code-review#2057 |
Collaborator
|
@cgsheeh I fixed the linting issue on master, could you rebase? |
Add a `use_latest_revision` config knob to the repo configuration that causes patch stacks to be applied to the latest revision in the repo (`tip`) instead of the parent revision of the base commit in the stack. This is useful for uplift revisions, where the parent of the base may not exist in the repo, and where applying the patch to the latest is desirable to get early feedback on any merge conflicts that will be encountered on landing. Move the logic for determining the initial `base_revision` into a separate function to enable a simple unit test.
cgsheeh
force-pushed
the
uplift-patch-apply-tip
branch
from
February 20, 2024 15:38
177024c to
96bb677
Compare
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a
use_latest_revisionconfig knob to the repo configuration thatcauses patch stacks to be applied to the latest revision in the repo
(
tip) instead of the parent revision of the base commit in the stack.This is useful for uplift revisions, where the parent of the base
may not exist in the repo, and where applying the patch to the latest
is desirable to get early feedback on any merge conflicts that will be
encountered on landing.
Move the logic for determining the initial
base_revisioninto aseparate function to enable a simple unit test.