https://bugzilla.wikimedia.org/show_bug.cgi?id=59892
Web browser: ---
Bug ID: 59892
Summary: Updating commit message in Gerrit resulted in new
patchset with older patchset code
Product: Wikimedia
Version: unspecified
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Git/Gerrit
Assignee: [email protected]
Reporter: [email protected]
CC: [email protected], [email protected],
[email protected], [email protected]
Classification: Unclassified
Mobile Platform: ---
What happened:
During code review of
https://gerrit.wikimedia.org/r/#/c/97871/19/includes/specials/SpecialMobileDiff.php
I noticed an error (line 208 of patchset 19 should concatenate, not assign).
After pointing this out to MaxSem, he fixed the problem with patchset 20
(https://gerrit.wikimedia.org/r/#/c/97871/19..20/includes/specials/SpecialMobileDiff.php).
Then, I made some minor changes to the commit message of patchset 20 in the
Gerrit interface:
https://gerrit.wikimedia.org/r/#/c/97871/20..21//COMMIT_MSG
However, after making the changes to the commit message, the change that MaxSem
made in patchset 20 disappeared from patchset 21:
https://gerrit.wikimedia.org/r/#/c/97871/20..21/includes/specials/SpecialMobileDiff.php
It didn't occur to me retest patchset 21 since I had just updated the commit
message, so I merged patchset 21 and wound up breaking mobile diffs in
production :(
Expected behavior:
Gerrit would have kept everything from patchset 20 with the exception of the
new commit message.
--
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
