Bug 239327
| Summary: | Keep local commit history separated from PR-ed one | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Yusuke Suzuki <ysuzuki> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | NEW | ||
| Severity: | Normal | CC: | pnormand, webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| Bug Depends on: | |||
| Bug Blocks: | 239082 | ||
Yusuke Suzuki
My workflow with webkit-patch is
1. First, creating a topic branch.
2. Land random multiple commits frequently (it is pile of change xxx, update xxx.
3. Then, once all the diff becomes good (git diff main), run webkit-patch upload --update-changelogs to generate ChangeLogs and upload a patch to bugzilla.
4. I typically just commit ChangeLog change itself.
5. Periodically, I rebase all of the above commits based on main.
6. Once review is done, and some changes are requested, I change this branch and add further commits (like, fix xxx etc.)
7. Then, run webkit-patch upload --update-changelogs again to regenerate ChangeLog files and upload a patch.
8. When landing, use webkit-patch land -v.
However, when using `git webkit pr`, it uploads multiple commits as PR if I have multiple commits locally.
While I set history = when-user-owned option, it does not change.
Please create PR branch separately from the actual local working branch, and generate commit message automatically from ChangeLog (as we did in commit of webkit-patch).
Keeping local history is important since I would like to revert some part of attempt locally while modifying code.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Radar WebKit Bug Importer
<rdar://problem/92084119>