Allow rebase in gerrit following renames
Closed, DeclinedPublic
Actions

Assigned To

None

Authored By

	Umherirrender
	Feb 24 2018, 11:29 PM

Description

The patch set https://gerrit.wikimedia.org/r/#/c/409342/ was not able to rebase through gerrit interface (Shows message that there are conflicts).

Using git command was working. The conflicts was with renamed classes from https://gerrit.wikimedia.org/r/#/c/409235/

Gerrit should rebase with following renames and allows such rebase like done on the command line.
At the moment there are many renames of files. With this feature it would be easier to keep as many as possible patch set mergable without many manual work.

Related Objects

Mentioned Here: T398513: Properly capitalise folders containing PHP files in MW core

Event Timeline

Umherirrender created this task.Feb 24 2018, 11:29 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptFeb 24 2018, 11:29 PM

Paladox subscribed.Feb 25 2018, 1:01 AM

Filled upstream at https://bugs.chromium.org/p/gerrit/issues/detail?id=8455

Paladox moved this task from Backlog to Reported Upstream on the Upstream board.Mar 4 2018, 6:47 PM

If there is a more recent use case we can possibly investigate why Gerrit rejected it. I guess it just considers a file renaming to be too complicated to handle.

With the renames in T398513: Properly capitalise folders containing PHP files in MW core it would be nice to revisit this task and have it also for cherry-picks to release branches.

A_smart_kitten subscribed.Nov 8 2025, 11:29 PM

Allow rebase in gerrit following renamesClosed, DeclinedPublicActions

Description

Related Objects

Event Timeline

Allow rebase in gerrit following renames
Closed, DeclinedPublic
Actions