Bug 238951 - [Merge-Queue] Canonicalize parent commits
Summary: [Merge-Queue] Canonicalize parent commits
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jonathan Bedard
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2022-04-07 12:07 PDT by Jonathan Bedard
Modified: 2022-04-07 15:44 PDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Bedard 2022-04-07 12:07:55 PDT
When running `git svn dcommit`, we might end up incorporating a commit that was landed but not yet mirrored to GitHub. In order to get a pull request marked as "merged", our parent commits need to be correct canonicalized locally. Given that our hooks are usually pretty quick to canonicalize and push commits to GitHub, we should be able to get away with canonicalizing only the our first 2 parent commits.
Comment 1 Radar WebKit Bug Importer 2022-04-07 12:08:08 PDT
<rdar://problem/91436607>
Comment 2 Jonathan Bedard 2022-04-07 12:10:57 PDT
Pull request: https://github.com/WebKit/WebKit/pull/262
Comment 3 EWS 2022-04-07 15:44:52 PDT
Committed r292573 (249411@main): <https://commits.webkit.org/249411@main>

Reviewed commits have been landed. Closing PR #262 and removing active labels.