Skip to:

  1. Skip to Jira Navigation
  2. Skip to Side Navigation
  3. Skip to Main Content

review Rebase Always submit strategy on Gerrit

Description

A new submit strategy was included in recent builds of Gerrit: Rebase Always.

Docs:

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.

It is only available in 2.14 while we are still at 2.12 and 2.13 is the current stable branch.

Activity

Show:

Former user May 2, 2017 at 7:57 AM

Closing for now as agreed, we can re-open once we're at gerrit 2.14 and have a use case for this strategy.

Barak Korren May 1, 2017 at 7:12 PM
Edited

We should close this ticket, i don`t think its gonna be useful for anything. Read my comment above.

'Rebase always' is just like 'Rebase when necessary' for all practical purposes, only it guarantees that the commit that ends up being merged will always be different then the one the developer that wrote it has locally. This will just be annoying.

Barak Korren April 5, 2017 at 6:57 AM

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?

Won't Do

Details

Assignee

Reporter

Blocked By

Priority

Parent

Created April 4, 2017 at 3:54 PM
Updated June 1, 2017 at 11:32 AM
Resolved May 2, 2017 at 7:57 AM