https://bugzilla.wikimedia.org/show_bug.cgi?id=45037
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #3 from [email protected] --- Something strange happened while doing reviews. I also did some stuff in another closed terminal. This is the history from the terminal where I checked out the latest stuff. I run tests in another terminal. 1342 git branch | fgrep '45150' 1343 git checkout master 1344 git pull 1345 git checkout maintenance-script-for-summary-45150 1346 git status 1347 git checkout master # at this point I left the summary-stuff in its branch 1348 git review -d 51179 # (bug 45037) show edit link only if we have repo links 1349 git checkout master 1350 git pull 1351 git review -d 53381 # (Bug 43994) New Special:UnconnectedPages 1352 git rebase origin/master 1353 git status 1354 git commit --amend 1355 git review 1356 git pull 1357 git checkout master 1358 git pull 1359 git review -d 53395 # Moved ClaimSaver and ExceptionWithCode to their own files 1360 git checkout master 1361 git pull 1362 git review -d 53414 # Show/hide the wikibase watchlist entries server side 1363 git rebase origin/master 1364 git checkout master # checkout of master to find the errors 1365 git pull 1366 history After 1362 I found that tests failed to run, did a checkout of master and found a lot of errors. 1359 should not introduce errors in the client. At 1348 I did not find any errors. Perhaps some rebase and/or merge has triggered something. This is the testrun that found the errors john@loke[master] ~/Workspace/core/tests/phpunit> env MW_INSTALL_PATH="/var/www/client" php phpunit.php --verbose --group WikibaseClient --conf /var/www/client/LocalSettings.php john@loke[master] ~/Workspace/Wikibase> git reset --hard HEAD^ HEAD is now at 0905d95 Merge "(bug 45037) show edit link only if we have repo links" john@loke[master] ~/Workspace/Wikibase> git reset --hard HEAD^^ HEAD is now at 7d3cb0f (Bug 41882) Followup for restrictions for special pages Going one back did not remove the errors, going two back did remove them. So it seems like the merge at 0905d95 "(bug 45037) show edit link only if we have repo links" triggered the errors. That is line 1348 in my history and I did not do a local rebase before the merge. I'm going to revert the changeset and then we must try to figure out what went wrong. -- You are receiving this mail because: You are on the CC list for the bug. You are watching all bug changes. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
