Maniphest T161966

Gerrit Index inconsistent
Closed, DeclinedPublic
Actions

Assigned To

None

Authored By

	Paladox
	Apr 1 2017, 9:49 PM

Description

Hi, viewing this https://gerrit.wikimedia.org/r/#/q/status:open i am seeing some of my changes as merge conflict. But they couldn't be as i just rebased them. Going into the patch shows no merge conflict. So this looks like index inconsistency.

See the image below

Screen Shot 2017-04-01 at 22.48.19.png (1×2 px, 935 KB)

Screen Shot 2017-04-01 at 22.48.26.png (1×2 px, 799 KB)

Notice how "PHPSessionHandler: Workaround PHP5 bug" on branch REL1_28 shows a merge conflict on status:open page but shows no merge conflict on the actual patch.

Event Timeline

Paladox created this task.Apr 1 2017, 9:49 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 1 2017, 9:49 PM

Paladox updated the task description. (Show Details)Apr 1 2017, 9:50 PM

It seems gerrit has supper powers and managed to figure out a merge conflict just as a change was being merged.

	F7135495: Screen Shot 2017-04-01 at 22.48.19.png
	Apr 1 2017, 9:49 PM

	F7135498: Screen Shot 2017-04-01 at 22.48.26.png
	Apr 1 2017, 9:49 PM

Gerrit Index inconsistentClosed, DeclinedPublicActions

Description

Event Timeline

Gerrit Index inconsistent
Closed, DeclinedPublic
Actions