[08:58:10] Nikerabbit: I have a question [09:26:54] Wikinaut: yes? [12:44:24] Nikerabbit: Question: re. https://gerrit.wikimedia.org/r/#/c/50478/ [12:44:40] after having +2 and +2, it was automatically merged... [12:44:51] (no problem, because it is working) [12:45:03] I have now the rest ready... [12:45:19] I mean, the fix of the remaining wfMsg to wfMessage [12:45:28] How to commit ? [12:45:59] Using "commit --amend" -- if this possible [12:46:01] ?? [12:46:19] or submitting the second part as an extra-commit [12:46:20] ?? [12:52:15] you need to make a new commit [13:25:40] I have a gerrit question. How can answer ? [13:26:18] Q: a certain commit (part 1 of a fix) is already merged. Is it wise and possible to "commit --amend" this ? [13:26:28] s/How/Who/ [13:44:42] Wikinaut: you already got your answer, "you need to make a new commit" [13:44:58] Yes [13:45:04] It's also written here .. [13:45:49] "Amending a change ...Sometimes, you might need to amend a submitted change. You can amend your own changes as well as changes submitted by someone else, as long as the change hasn't been merged yet." [13:46:01] https://www.mediawiki.org/wiki/Git/Tutorial#Amending_a_change [13:46:03] :-) [13:46:06] it makes sense [14:18:37] New patchset: Platonides; "Whitelist getcwd()" [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50590 [14:18:37] New patchset: Platonides; "Take into account files which include another file that then dies." [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50589 [14:19:58] New review: Platonides; "Patchset 2: Fixes a bug where find-entries.php maintenance/storage/resolveStubs.php maintenance/stor..." [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50589 [16:40:48] he, I always have these stupid rebase problems [16:40:58] git review -R [16:40:59] You have more than one commit that you are about to submit. [16:41:01] The outstanding commits are: [16:41:02] c5c2f73 (master) Merge branch 'master' of https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OpenID [16:41:04] 00d0c60 Localisation updates from http://translatewiki.net. [16:41:06] Is this really what you meant to do? [16:41:07] Type 'yes' to confirm: no [16:41:09] Aborting. [16:41:10] Please rebase/squash your changes and try again [16:41:36] it's for the third time. Why isn't it respecting my merge ? [17:27:33] Nikerabbit: can you also help me with Use of User::getSkin was deprecated in MediaWiki 1.18. [Called from OpenIDHooks::onPersonalUrls in mediawiki/extensions/OpenID/OpenID.hooks.php at line 112] [17:28:33] http://dpaste.org/o7tJc/ [17:30:10] ^ solved [17:51:20] s/solved/not solved/ [18:13:40] Wikinauts get no respect... [21:34:26] Nikerabbit can you (please) code review my wfMsg changes (cumulative patch) on https://gerrit.wikimedia.org/r/#/c/50604/ I'll buy you a beer, or two, next time in Berlin [21:34:57] (I tested it, the code works.) [21:35:15] Live on http://openid-wiki2.instance-proxy.wmflabs.org/wiki/Main_Page [21:35:51] oops, a space [21:35:54] Nikerabbit: [21:36:48] sleeping [21:42:42] how can I edit the description (text) of a project in gerrit [21:43:12] looked around, but could not find a hint [21:44:16] New patchset: Platonides; "Instead of having multiple $cliSapiAutomaton, make it an array." [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50707 [21:44:17] New patchset: Platonides; "Add a couple of automatons" [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50708 [21:44:48] New review: Platonides; "Note: router.php only reads from $_SERVER["SCRIPT_FILENAME"] or " [mediawiki/tools/code-utils] (master) - https://gerrit.wikimedia.org/r/50708