Last modified: 2013-09-09 03:29:03 UTC
https://gerrit.wikimedia.org/r/#/c/82796/ - sha1: 8587e2e4b4f90ca9cdba0f39e647b235921a5ae8 Missing on git.wm.o, gerrit, github: https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FMassMessage.git https://github.com/wikimedia/mediawiki-extensions-MassMessage/commits/master km-mpb:~ km$ git clone ssh://legoktm@gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage.git Cloning into 'MassMessage'... [snipped] Checking connectivity... done km-mpb:~ km$ cd MassMessage/ km-mpb:MassMessage km$ git log --oneline 85283ca Localisation updates from http://translatewiki.net. b9ccd1c Autocomplete suggestions for spamlist input 3027dc6 Localisation updates from http://translatewiki.net. 8d106e1 Localisation updates from http://translatewiki.net. [snipped] Luckily this is a pretty minor change, so I can re-do it, but it really shouldn't have disappeared in the first place...
Eventhough the WebUI shows the change as having status 'Merged', the change cannot be fetched directly: git fetch ssh://qchris@gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage refs/changes/96/82796/1 fatal: Couldn't find remote ref refs/changes/96/82796/1
This breakage seems to be a side-effect of the gerrit migration. For me, $ git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualEditor $ cd VisualEditor ; git log --oneline -1 feff1fb Merge "Improve welcome dialog support for large fonts" versus $ git clone https://git.wikimedia.org/git/mediawiki/extensions/VisualEditor.git $ cd VisualEditor ; git log --oneline -1 47545a5 Remove no-insertion metadata corner case from `ve.dm.Transaction.pushReplace()` Note that https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FVisualEditor shows the latter commit, but 'git review -s ; git log gerrit/master' shows the former.
(In reply to comment #2) > This breakage seems to be a side-effect of the gerrit migration. For me, > > $ git clone > https://gerrit.wikimedia.org/r/p/mediawiki/extensions/VisualEditor > $ cd VisualEditor ; git log --oneline -1 > feff1fb Merge "Improve welcome dialog support for large fonts" > I can't reproduce. I get 47545a5 Remove no-insertion metadata corner case from `ve.dm.Transaction.pushReplace()`. as expected.
Mea culpa -- my bug (in comment 2) was caused by an out-of-date entry for gerrit.wikimedia.org in my /etc/hosts file. =(
To the original reporter: can you confirm the IP address you are using for gerrit.wikimedia.org? That would let us figure out if you have the same issue I was having, or a different one.
I don't think my issue is the same since the commit is missing from both the web viewers on git.wm.o and github. I'm not sure I've hardcoded an IP anywhere, I just use gerrit.wikimedia.org when cloning.
(In reply to comment #6) > I don't think my issue is the same since the commit is missing from both the > web viewers on git.wm.o and github. > > I'm not sure I've hardcoded an IP anywhere, I just use gerrit.wikimedia.org > when cloning. So what happened here was the change was merged without a merge commit. Will require some manual wrangling one way or the other to fix.
(In reply to comment #7) > (In reply to comment #6) > > I don't think my issue is the same since the commit is missing from both the > > web viewers on git.wm.o and github. > > > > I'm not sure I've hardcoded an IP anywhere, I just use gerrit.wikimedia.org > > when cloning. > > So what happened here was the change was merged without a merge commit. Will > require some manual wrangling one way or the other to fix. Maybe I'm misunderstanding, but the commit was merged just fine. It didn't need a merge commit since at the time, it was directly on top of the current HEAD. It was replicated to github fine, and I pulled locally using my gerrit remote. When the upgrade happened it vanished. At that point, it was missing from gerrit.wm.o, but it was still visible on github, until the l10n-bot updated the translations, off of the HEAD on gerrit, which was (force?) pushed to github and overrode the "fix typo" commit.
*** This bug has been marked as a duplicate of bug 53841 ***
