[11:48:10] [[Tech]]; 37.207.217.50; /* Inserimento link */ new section; https://meta.wikimedia.org/w/index.php?diff=11696697&oldid=11689628&rcid=6128689 [11:52:31] [[Tech]]; 37.207.217.50; http://bandadicropani.jimdo.com; https://meta.wikimedia.org/w/index.php?diff=11696712&oldid=11696697&rcid=6128693 [13:30:28] hi [13:30:35] https://commons.wikimedia.org/wiki/Commons:Deletion_requests/File:Arsenlogo.jpg [13:32:09] Lua error in Module:Fallback at line 73: attempt to index a nil value. [13:39:16] ok, disappeared after a nul edit [14:03:04] Ehrm … why does https://en.wikipedia.org/w/api.php?action=query&prop=categories&titles=Albert%20Einstein&clprop=hidden only list the 6 hidden categories while https://en.wikipedia.org/wiki/Albert_Einstein#External_links has more than this [14:03:17] I've tried action=purge and it didn't help [16:21:43] I'm having a weird error with gerrit. It's rejecting my head with the reason "(change 200163 closed)" which of course it is, because it's merged [16:21:54] I have the latest version of master and rebased against it [16:22:05] and the change id isn't the same [16:22:26] and the history looks totally fine, with the "closed" change being the HEAD on master... [16:25:22] mvolz, what does 'git log -1' show you? [16:25:30] the last commit from master or yours? [16:26:13] mine [16:26:57] And then you are doing what? [16:27:08] ooh I think it I figured it out [16:27:34] it has two of the same commit in the tree for some reason [16:28:06] Did the rebase apply completely? [16:28:21] with two different change ids... must have been some weird merging [16:28:27] yeah it did, but I rebased it twice [16:28:41] and one time it but the commit behind, and one time in front. so weird. [16:29:01] O…kay [16:29:03] probably because I might have had a different order locally than master? [16:29:11] it put* [16:29:25] this is the last time i trust you rebase! the last time! :D [16:29:34] Well ;) [16:30:08] Did your patch depend on another one? [16:30:22] so i need to excise that change in the middle of the tree. or something. [16:30:41] So lets say you got master → CS A with PS 1 → your CS and now master → CS A with PS 2 [16:30:51] when you rebase there you only must rebase your commit [16:31:02] but when you do “git rebase master” you also rebase PS1 of CSA [16:31:05] *CS A [16:31:14] (because PS1 is not in master) [16:31:38] Which would result in [16:31:48] master → CS A PS 2 → CS A PS 1 → your CS [16:32:01] in that case: git rebase HEAD~1 --onto master [16:32:11] HEAD~1 == select only the last commit [16:32:22] --onto master == new parent of the selected commit(s) [16:33:00] Although that wouldn't explain why your commit is in between … [16:33:06] and the different change IDs [16:33:25] What do you try now mvolz ? Just rebasing your commit? [16:33:54] ah, no, the change ids are the same [16:33:58] that was bad info [16:33:59] in that case “git rebase HEAD~1 --onto master” should work (even if there are commits after the commit your are currently on) [16:34:03] Okay [16:34:13] so maybe those are two different PSes of the same CS? [16:35:09] xzise: that fixed it [16:35:13] tweas [16:35:24] thanks :) [16:35:32] :) [16:35:48] the main problem with “git rebase FOO” is [16:36:03] that it uses the common anchestor of FOO and the current head [16:36:27] and then moves all commits between the common ancestor and the current head on top of FOO [16:36:36] aha [16:36:40] So you need to specify which commits you want to move [16:37:00] HEAD~1 selects the commit before the commit you have checked out [16:37:24] So it'll choose all commits between that commit and your checked out commit, which is only the checked out commit [16:37:47] and with --onto you say what commit is the new parent [16:37:48] in my case because I had a different order from master, it just put duplicates on top of the earliest common commit [16:37:59] Yes [16:38:33] so in the future as long as it's only one commit I should specify my current commit and that's it :) [16:38:52] okay, makes sense [16:38:57] Well when you know that your commit is based on master [16:39:06] you “git rebase master” will work [16:40:02] Not sure how you got a different order but when you do “git checkout -b NEW_BRANCH master” then your commit will be based on master [16:40:47] (git branch NEW_BRANCH master, git checkout NEW_BRANCH will also work it's nothing special about git checkout -b) [16:41:09] afaik “git merge-base HEAD master” should give you the common ancestor [16:43:54] The order mixup happened because I had a fix for a really critical bug, and I put that under another commit that was already pending [16:44:09] and then this commit had already been made on top of THAT commit [16:44:47] without the critical one under it [16:44:53] and... well anyway, it makes sense to me :) [16:45:43] and this is trees are fun! [16:45:56] is why* [16:46:46] :D [16:46:55] I figured it was something like that [17:07:41] hi [17:07:49] I got again "Lua error in Module:Fallback at line 73: attempt to index a nil value." [17:08:24] not reproductible so far [17:30:08] https://commons.wikimedia.org/w/index.php?title=Special%3AUserRights&user=TaxonBot <- something's very weird here [17:31:20] last log I see is 28 March 2015 H-stt (talk | contribs | block) changed group membership for User:TaxonBot from bot to bot, IP block exempt and file mover (justified request in person - now reduced to the most relevant rights for this user) [17:31:35] but these rights are NOT set [19:31:40] Having some trouble with git-review whining about 404s URLs, can anyone lend a hand? [19:32:39] hi . i have made a converter. it need to be reviewed and accepted. i have developed it to convert a little text. but further development is needed. cannot be here separate commit to mediawiki which just creates a new feature, so that further development of it is planned? ( reviewers said to me to develop it, as i remember ... ) here it is https://gerrit.wikimedia.org/r/164049 . (going to... [19:32:41] ..."crosspost" this to 4 channels). [19:33:30] git-review always tries to fetch data from gerrit.wikimedia.org/foo instead of gerrit.wikimedia.org/r/foo and then gives me an InvalidSSLContext, anyone know why that is? [19:44:07] ferdbold: I see the issue [19:44:19] you're in the wrong git repo when you try to checkout those changes [19:44:51] you've got one of the changes committed from within the extension, and the other from VisualEditor/VisualEditor [20:07:24] This didn't solve it, it doesn't try to fetch data from .org/r/ [20:07:55] I managed to fix the SSL context issue, but I still can't run git review with the right URL