Bug 171082 - update-webkit should perform a rebase-style merge when updating.
Summary: update-webkit should perform a rebase-style merge when updating.
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
Depends on:
Reported: 2017-04-20 15:39 PDT by Kocsen Chung
Modified: 2017-04-21 15:07 PDT (History)
10 users (show)

See Also:

Patch (1.51 KB, patch)
2017-04-20 15:40 PDT, Kocsen Chung
dbates: review-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kocsen Chung 2017-04-20 15:39:28 PDT
update-webkit should perform a rebase-style merge when updating.
Comment 1 Kocsen Chung 2017-04-20 15:40:15 PDT
Created attachment 307648 [details]
Comment 2 Kocsen Chung 2017-04-20 16:17:07 PDT
Comment 3 Daniel Bates 2017-04-20 19:17:59 PDT
Comment on attachment 307648 [details]

View in context: https://bugs.webkit.org/attachment.cgi?id=307648&action=review

> Tools/ChangeLog:10
> +        to mimic `git svn rebase` behavior in the case of a git-svn repo.

Why do we need to force a particular workflow on people's local branches? We should email webkit-dev to see if anyone would object to forcing a rebase workflow for their local branches.
Comment 4 Kocsen Chung 2017-04-20 20:47:40 PDT
I don't see this as forcing a specific workflow - I see it more as more better mirroring the workflow WebKit currently uses.

Those on git-svn have no option to update their checkout other than using git-svn **rebase** which is achieved in pure git with the `--rebase` flag.


Having said that that is not the intent of this change. It is more to alleviate the problem from the radar in Comment 2.
That particular problem could be easily remediated without any changes to the WebKit codebase.

What are your thoughts?
Comment 5 Michael Catanzaro 2017-04-20 21:19:19 PDT
This change seems fine to me. Surely almost all WebKit devs always want --rebase.
Comment 6 Kocsen Chung 2017-04-21 15:07:22 PDT
Upon second thought, it's important to realize that --rebase is a destructive action as it rewrites history. Although we can infer that this is what most people want we do not have the data.
This means we should probably start a discussion amongst webkit-dev to see if this would impact other workflows that we are unaware of. Only then can we be confident to even change this.

Keeping in mind that the current workflow allows those who would want to opt-in to `--rebase` workflow to set it in their git configuration as so with: `git config pull.rebase true`.