[eclipse-pmc] Request to change gerrit merge strategy to "Rebase always"

["Sravan K Lakkimsetti" <sravankumarl@xxxxxxxxxx>]

Hi,

 

Off late we are seeing build failures due to qualifier not getting updated. Following is the mail thread analysing one of the problem. This is definitely not an isolated incident.

To avoid this we should update git commit timestamp to gerrit merge timestamp. This can be achieved by “cherry-pick” or “Rebase always”

 

I would like PMC to consider changing gerrit merge strategy to “rebase always”.  Raised Bug 572412 - Change gerrit merge strategy to Rebase always for your consideration

 

Thanks

Sravan

 

From: Aleksandar Kurtakov <akurtako@xxxxxxxxxx>
Sent: 24 March 2021 23:18
To: Eclipse platform release engineering list. <platform-releng-dev@xxxxxxxxxxx>
Subject: [EXTERNAL] Re: [platform-releng-dev] 4.20 I-Build: I20210324-0320 - BUILD FAILED - Analysis and with root cause.

 

On Wed, Mar 24, 2021 at 7:31 PM Mickael Istria <mistria@xxxxxxxxxx> wrote: Rebasing via CLI doesn't change the commit date by default; so I'm not certain "Rebase always" from Gerrit does. In m2e, we've faced the

 

 

On Wed, Mar 24, 2021 at 7:31 PM Mickael Istria <mistria@xxxxxxxxxx> wrote:

Rebasing via CLI doesn't change the commit date by default; so I'm not certain "Rebase always" from Gerrit does.

In m2e, we've faced the same problem recently, which is made more visible with a lot of changes merged in a short time-frame (like Platform on the beginning of M1) while it uses GitHub "Rebase and merge" action. So it seems that the GitHub rebase doesn't change the dates either. I'd be (positively) surprised if Gerrit does it differently than Git CLI and GitHub.

 

Documentation say "Similar to Rebase If Necessary, but creates a new patch set even if fast forward is possible. This strategy is also similar to Cherry Pick; however, Rebase Always does not ignore dependencies"

so it sounds like what we need.

_______________________________________________
platform-releng-dev mailing list
platform-releng-dev@xxxxxxxxxxx
To unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/platform-releng-dev

--

Aleksandar Kurtakov

Red Hat Eclipse Team