Bug 239297
| Summary: | [git-webkit] pr command runs 'git rebase --continue' three times in a row | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Michael Catanzaro <mcatanzaro> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED WONTFIX | ||
| Severity: | Normal | CC: | jbedard, mcatanzaro, webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
Michael Catanzaro
Looking at the output of 'git-webkit pr' that I posted in bug #239296, I notice something interesting:
Running 'git rebase --continue'...
Successfully rebased and updated refs/heads/eng/Misc-compiler-warnings-April-2022-edition.
Running 'git rebase --continue'...
fatal: No rebase in progress?
Running 'git rebase --continue'...
fatal: No rebase in progress?
Successfully rebased and updated .
Rewrite 8734aa0fbbe6b93d301c2867aa7a6c19daf1bef3 (1/1) (0 seconds passed, remaining 0 predicted)
WARNING: Ref 'refs/remotes/origin/main' is unchanged
Ref 'refs/heads/eng/Misc-compiler-warnings-April-2022-edition' was rewritten
Seems git-webkit attempted to rebase three times. O_O That's probably not right.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
Ryan Haddad
rdar://92044626
Jonathan Bedard
Do you know the kind of change this was run on? That has to do with conflict resolution in changelogs, I wonder if you get a different prompt for each changelog.
Michael Catanzaro
Looks like it was https://github.com/WebKit/WebKit/pull/282. And there are indeed three changelogs involved there: JavaScriptCore, WebCore, and WebKit.
Jonathan Bedard
(In reply to Michael Catanzaro from comment #3)
> Looks like it was https://github.com/WebKit/WebKit/pull/282. And there are
> indeed three changelogs involved there: JavaScriptCore, WebCore, and WebKit.
Looks like another point for "get rid of ChangeLogs"...