https://bugzilla.wikimedia.org/show_bug.cgi?id=36575
Roan Kattouw <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |[email protected] Resolution| |FIXED --- Comment #5 from Roan Kattouw <[email protected]> 2012-05-10 22:41:02 UTC --- (In reply to comment #2) > This is not git or gerrit's fault, it's Special:Version's fault. It's not, see bug 36749 comment 1. Krinkle's theory in comment 1 on this bug was exactly right: both the wmf1 and wmf2 checkouts were messed up with people creating local cherry-picks that they then resubmitted (but based against a different parent) through Gerrit. So there was a commit that was on the fenari checkout but not in the remote, which caused git pull to create a merge commit every time it updated, and those merge commits are of course also local to fenari. I fixed the weird repo state, Special:Version now links to a different commit that does actually exist in the remote. -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- 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
