-
Notifications
You must be signed in to change notification settings - Fork 981
[canary] 🚀 Use dataclasses
for 3way merging
#28160
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
Merged
Merged
Conversation
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
5bcad87
to
6e36028
Compare
6e36028
to
bb1aba8
Compare
5d561f8
to
3455342
Compare
3455342
to
13ff5dd
Compare
2503158
to
68d0d12
Compare
88c53dd
to
4095d40
Compare
emerick
approved these changes
Mar 18, 2025
This PR introduces several data classes to better compartimentalise the data being used in this tool. The previous code relied on a very large method to do all the operations necessary during patch resolution. The management of the continuation file is also being overhauled to be its own code, separate from `PatchFailureResolver`, as the continuation file also stores things like `working_version` which is not necessarily part of the merge process. **Version Type** This type is being introduced to simplify the operations around version in Brockit. The code is now easier to understand, and the operations are grouped. **Infra Mode** This new execution mode suppresses the status page, and as a replacement, provides terminal "keep alive" output, to allow the CI to be kept alive. Resolves brave/brave-browser#44690 Resolves brave/brave-browser#44727
4095d40
to
2293f5c
Compare
Released in v1.78.51 |
This was referenced Apr 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR introduces several data classes to better compartimentalise the data being used in this tool. The previous code relied on a very large method to do all the operations necessary during patch resolution.
The management of the continuation file is also being overhauled to be its own code, separate from
PatchFailureResolver
, as the continuation file also stores things likeworking_version
which is not necessarily part of the merge process.Version Type
This type is being introduced to simplify the operations around version in Brockit. The code is now easier to understand, and the operations are grouped.
Infra Mode
This new execution mode suppresses the status page, and as a replacement, provides terminal "keep alive" output, to allow the CI to be kept alive.
A separate issue has been created to come up with something better than pickle for serialisation brave/brave-browser#44726
Resolves brave/brave-browser#44690
Resolves brave/brave-browser#44727
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
wikinpm run presubmit
wiki,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan: