Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: c2e76f6579ddf2b7c0424c7b23405c1a5c1aff38
https://github.com/WebKit/WebKit/commit/c2e76f6579ddf2b7c0424c7b23405c1a5c1aff38
Author: Alex Atwater <[email protected]>
Date: 2024-09-12 (Thu, 12 Sep 2024)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/conflict_unittest.py
Log Message:
-----------
Update git-webkit conflict to support additional integration/ branches
https://bugs.webkit.org/show_bug.cgi?id=278562
rdar://129681381
Reviewed by Ryan Haddad.
This will now search for updated integration branches when running git-webkit
conflict.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py:
(Conflict):
(Conflict.parser):
(Conflict.find_conflict_pr):
(Conflict.get_open_integration_prs):
(Conflict.main):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/conflict_unittest.py:
(TestConflict._mock_radar_response):
(TestConflict.test_conflict_not_found):
(TestConflict.test_conflict_found):
Canonical link: https://commits.webkit.org/283569@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
