[JIRA] (OVIRT-1296) review Rebase Always submit strategy on Gerrit

[Barak Korren (oVirt JIRA)]

    [ https://ovirt-jira.atlassian.net/browse/OVIRT-1296?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=29602#comment-29602 ] 

Barak Korren commented on OVIRT-1296:
-------------------------------------

Using 'Rebase Always' will have indeed allowd us to meet some user's requests. But it has the downside where you will never be able to fast-forward over your own local commits because the merged commits will always be different then the submitted ones.

Still, worth publishing to devel and seeing if anyone wants to try this in his project. 

BTW I seem to remember I already saw it as an option somewhere, was I looking at the staging instance?

> review Rebase Always submit strategy on Gerrit
> ----------------------------------------------
>
>                 Key: OVIRT-1296
>                 URL: https://ovirt-jira.atlassian.net/browse/OVIRT-1296
>             Project: oVirt - virtualization made easy
>          Issue Type: Improvement
>            Reporter: Evgheni Dereveanchin
>            Assignee: infra
>            Priority: Lowest
>
> A new submit strategy was included in recent builds of Gerrit: Rebase Always.
> [Docs|https://gerrit-review.googlesource.com/Documentation/project-configuration.html#rebase_always]:
> {quote}Basically, the same as Rebase If Necessary, but it creates a new patchset even if fast forward is possible AND like Cherry Pick it ensures footers such as Change-Id, Reviewed-On, and others are present in resulting commit that is merged.
> Thus, Rebase Always can be considered similar to Cherry Pick, but with the important distinction that Rebase Always does not ignore dependencies.{quote}
> It is only available in [2.14|https://gerrit.googlesource.com/gerrit/+/stable-2.14/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/] while we are still at 2.12 and [2.13|https://gerrit.googlesource.com/gerrit/+/stable-2.13/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/] is the current stable branch.



--
This message was sent by Atlassian JIRA
(v1000.883.0#100040)