[00:00:49] <Dragonfly6-7>	 I have
[00:00:55] <Dragonfly6-7>	 today I'm asking more specific questions
[00:01:47] <jeremyb_>	 i think i saw that exact question before
[00:01:53] <Dragonfly6-7>	 Possible
[00:02:03] <Dragonfly6-7>	 do you have any idea as to how to resolve that issue?
[00:02:54] <jeremyb_>	 yes...
[00:03:28] <jeremyb_>	 1) identify the page element using something like the DOM inspector and then choose a selector for it
[00:03:46] <jeremyb_>	 2) set css for that selector to 1.2em or 0.8em or something like that
[00:03:54] <jeremyb_>	 tweak as needed
[00:03:58] <jeremyb_>	 3) profit!
[00:04:18] <jeremyb_>	 i feel no motivation to help any more than that at this point
[00:04:19] <Dragonfly6-7>	 I'm sorry, you're assuming a skill set not in evidence
[00:04:24] <Dragonfly6-7>	 ":DOM inspector" ?
[00:04:30] <Dragonfly6-7>	 choose a selector? How?
[00:04:46] <jeremyb_>	 errr, no. actually i'm not
[00:05:01] <Dragonfly6-7>	 you're assuming I know how to do this. I'm pointing out that I don't.
[00:05:04] <jeremyb_>	 i was kinda assuming your response would be something like that. which is why i didn't offer help earlier
[00:05:28] <Dragonfly6-7>	 Yes. Can you offer a *more detailed* solution?
[00:06:18] <Susan>	 What are you trying to resize?
[00:06:41] <jeremyb_>	 pick any of dom inspector, firebug, or any other tool which allows you to click on part of the page to select the corresponding thing in said tool
[00:07:07] <jeremyb_>	 pick a selector for the thing it highlighted or maybe one of it's parents
[00:07:16] <jeremyb_>	 do 2 and 3 from above
[00:08:04] <jeremyb_>	 maybe see https://en.wikipedia.org/wiki/User:Jeremyb/vector.css for inspiration
[00:08:39] <jeremyb_>	 i didn't pull those selectors out of thin air...
[01:40:07] <snitch>	 [[Tech]]; DragonflySixtyseven; update; https://meta.wikimedia.org/w/index.php?diff=5442089&oldid=5427550&rcid=4130599
[01:45:44] <snitch>	 [[Tech]]; DragonflySixtyseven; ffs; https://meta.wikimedia.org/w/index.php?diff=5442093&oldid=5442089&rcid=4130603
[02:53:20] <Teles>	 Hi. There is a bigdelete request for pt.wikipedia. I wonder if I can do it know.
[02:53:46] <Teles>	 this is the page: https://pt.wikipedia.org/wiki/Usu%C3%A1rio:GRS73/Arquivo/Agosto/2008
[02:56:58] <Teles>	 vvv ^
[03:02:49] <p858snake|l>	 Teles: If you file it in bugzilla, someone will do it
[03:03:34] <legoktm>	 um
[03:03:40] <Teles>	 wasn't supposed to be done by stewards?
[03:03:42] <legoktm>	 Teles: can't you do it yourself?
[03:04:37] <Teles>	 I can, but I need approval from some op to check if I won't break anything
[03:05:25] <legoktm>	 ok, im not really sure who you'd get that from...
[03:07:06] <Teles>	 I'm almost sure that vvv is one of them, but looks like he's not aroun
[03:08:38] <Susan>	 You'd want someone like Tim, not Victor.
[03:08:43] <Susan>	 I guess.
[03:09:30] <Susan>	 I thought the bigdelete limit was 10,000. Is it actually 5,000?
[03:10:01] <Teles>	 yeah. A local admin already tried to delete it, but couldn't.
[03:11:33] <Susan>	 Teles: You have my blessing to delete the page, in accordance with local policy.
[03:12:56] <Teles>	 somebody wants so separate some revisions. I will be restored afterwards
[03:13:51] <Susan>	 It won't be an enjoyable exercise to load Special:Undelete with over 5,000 revisions.
[03:13:54] <Susan>	 But it's fine.
[03:15:04] <Teles>	 http://toolserver.org/~vvv/revcounter.php?wiki=ptwiki_p&title=Usu%C3%A1rio%3AGRS73%2FArquivo%2FAgosto%2F2008
[03:15:41] <Teles>	 the advice stewards received is that they have to stay in contact with somebody from operations team
[03:16:12] <Susan>	 https://pt.wikipedia.org/w/index.php?title=Usuário:GRS73/Arquivo/Agosto/2008&action=info
[03:16:29] <Susan>	 There's no advice there. :-)
[03:16:37] <p858snake|l>	 Teles: i'm sure TimStarling will yell out in the unlikely case you actually break something
[03:21:39] <Teles>	 well, we were told to it only after approval
[03:25:27] <TimStarling>	 you can do it
[03:25:55] <Susan>	 Teles: ^
[03:26:15] <Teles>	 ah, good. Thanks :)
[03:26:31] <closedmouth>	 don't give up
[03:26:42] <closedmouth>	 we believe in you
[03:30:06] <Teles>	 :D
[03:31:57] <Teles>	 I wonder if I have to follow this same procedure in case I want to restore it
[03:32:29] <Jasper_Deng>	 possibly, if you're doing all >5k at once
[03:32:35] <Jasper_Deng>	 (same sort of thing, db writing)
[03:37:11] <TimStarling>	 restoring is probably not as well-tested as deleting
[03:37:59] <TimStarling>	 I think part of the reason we make it hard to delete articles with big histories is to smooth out some of that community fickleness
[03:38:27] <TimStarling>	 and make sure such articles are only deleted when they really really need to be deleted
[03:39:27] <p858snake|l>	 TimStarling: Who says the community doesn't want me to delete the main page? >.>
[03:47:23] <Teles>	 if a deletion of this kind of page can cause server problems, it seems to be logical that restoring it may have the same effect
[03:47:58] <Susan>	 Bigdelete exists because moving rows between tables is annoying and could potentially lock up the sites for an hour.
[03:48:14] <Susan>	 When someone deletes the English Wikipedia's sandbox or whatever.
[03:48:20] <Susan>	 I thought the limit was higher.
[03:48:27] <Susan>	 Though I guess 5000 is as sensible as any.
[03:48:36] <Susan>	 Special:Undelete is still not paginated, as I recall.
[03:48:46] <Teles>	 lemme try deleting the sandbox and see what happens...
[03:49:31] <Teles>	 <blue screen of death>
[03:50:08] <Susan>	 You've won Wikipedia.
[03:50:09] <Susan>	 https://bugzilla.wikimedia.org/show_bug.cgi?id=7996
[03:50:24] <Susan>	 The point being that at some limit, your browser won't want to load all those checkboxes.
[03:54:00] <Susan>	 The bugs in this area are scattered and weird. I feel like I'm missing a few.
[12:04:55] <ankry>	 any lilipond expert here ?
[12:32:54] <Qcoder00>	 Hi , I was looking for a citation searcher? Is there one?
[12:37:18] <p858snake|l_>	 Qcoder00: This channel is for help and discussion in regards to the technical backend for the WMF cluster, Your question may be better suited for #wikipedia-en or variant channels
[13:20:27] <Nemo_bis>	 is it normal for a request of a PNG thumb to take 10 s?
[13:20:51] <petan>	 yes
[13:28:26] <brion>	 if it's REALLY BIG the first time maybe
[13:28:33] <brion>	 but…. it really shouldn't most of the time :)
[13:30:50] <paravoid>	 Nemo_bis: what brion said, also I'm looking at graphs and I don't see any pattern of increased response times on the upload infrastructure
[13:31:01] <paravoid>	 Nemo_bis: but if yu do see more of these, do let us know
[13:31:33] <jeremyb_>	 and try to get the headers...
[13:36:58] <Nemo_bis>	 brion, paravoid, doesn't seem big to me https://commons.wikimedia.org/wiki/File:Christian_distribution.png
[13:37:22] <brion>	 yeah that's not too huge
[13:37:24] <Nemo_bis>	 http://p.defau.lt/?vOg3d3tHYLIsyt_O6U3QLw
[13:37:46] <Nemo_bis>	 it also happened to me with the original of a SVG yesterday
[13:37:57] <Nemo_bis>	 so I'm a bit confused
[13:38:10] <brion>	 i can get 801 and 802px versions rendered fairly quickly… might be a fluke with one server or a one-time slowness fetching from the storage
[13:38:19] <brion>	 well not one-time but intermittent :)
[13:39:43] * jeremyb_  introduces Dragonfly6-7 to <s>

[13:41:12] <jeremyb_>	 Nemo_bis: yours was a cache miss all the way down the stack...
[13:41:42] <brion>	 well if it had to generate, that's to be expected :)
[13:43:53] <Nemo_bis>	 still it doesn't purge the 800px thumb :(
[13:45:19] <jeremyb_>	 well it's also 0.04 secs according to wget. so nothing to complain about
[13:45:35] <jeremyb_>	 Nemo_bis: what did you expect to be purging?
[13:48:29] <Nemo_bis>	 the thumb
[13:48:55] <jeremyb_>	 with which action?
[13:49:30] <Nemo_bis>	 action=purge
[13:50:26] <jeremyb_>	 errr, on what?
[13:50:34] <jeremyb_>	 full URL maybe...
[13:50:47] <Nemo_bis>	 ...? the image above
[13:51:09] <Nemo_bis>	 aka https://bugzilla.wikimedia.org/show_bug.cgi?id=47825
[13:51:31] <jeremyb_>	 that URL doesn't have action=purge in it
[13:51:38] <jeremyb_>	 please just give the full URL
[13:55:05] * jeremyb_  waits for Nemo_bis

[13:59:14] <Nemo_bis>	 jeremyb_: sorry, I don't understand the question
[13:59:49] <jeremyb_>	 Nemo_bis: give me the steps you take to do a purge
[14:05:19] <Nemo_bis>	 1) Click the "purge" button https://commons.wikimedia.org/w/index.php?title=File%3AChristian+distribution.png&action=purge
[14:05:41] <Nemo_bis>	 [yes I'm too lazy to use the API and I would have said if I used that]
[14:06:13] <jeremyb_>	 doesn't matter if you're too lazy to use the API. you didn't say what you did use :(
[14:06:16] <jeremyb_>	 until now
[14:07:00] <jeremyb_>	 is there a particular part of the map that changed to compare?
[14:09:03] <Nemo_bis>	 the refs
[14:09:17] <jeremyb_>	 aha
[14:09:57] <Nemo_bis>	 history is your friend ;)
[14:12:41] <jeremyb_>	 apparently dysprosium is the one of the guilty
[14:12:53] <jeremyb_>	 dysprosium is in eqiad
[14:12:56] <jeremyb_>	 not europe
[14:14:06] <jeremyb_>	 paravoid: ^
[14:14:24] <jeremyb_>	 s/is the/is/
[14:14:33] <paravoid>	 I don't understand a thing :)
[14:14:46] <jeremyb_>	 paravoid: an eqiad varnish is maybe not purging
[14:14:56] <paravoid>	 dysprosium?
[14:15:19] <jeremyb_>	 that's the one :)
[14:15:25] <mark>	 ill have a look
[14:15:57] * jeremyb_  looks up that element...

[14:16:33] <mark>	 i see purges being processed on dysprosium just fine
[14:17:21] <jeremyb_>	 well then it's one of those in varnish but not in swift?
[14:17:28] <jeremyb_>	 iirc that's been a past reason to not purge?
[14:17:40] <mark>	 i don't understand?
[14:17:55] <jeremyb_>	 isn't the list of thumbs to purge built using swift?
[14:18:09] <jeremyb_>	 so if a thumb is in varnish but not swift somehow then you can't purge it?
[14:18:50] <jeremyb_>	 at least that's how i thought things worked and i think i've heard of that scenario being an issue in the past
[14:19:27] <jeremyb_>	 anyway, the point is https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/Christian_distribution.png/800px-Christian_distribution.png is out of date
[14:19:32] <jeremyb_>	 some text on the bottom has changed
[14:20:02] <jeremyb_>	 mark: ^
[14:20:45] <mark>	 yes but it should have been purged when the thumb got deleted
[14:21:32] <jeremyb_>	 right
[14:22:22] <paravoid>	 4/44/Christian_distribution.png/120px-Christian_distribution.png
[14:22:23] <paravoid>	 4/44/Christian_distribution.png/350px-Christian_distribution.png
[14:22:25] <paravoid>	 that's what swift has
[14:23:36] <jeremyb_>	 paravoid: now what does swift have?
[14:24:02] <paravoid>	 + 75px + 800px, why?
[14:24:18] <jeremyb_>	 because i loaded the 800px with a bogus query string
[14:24:50] <jeremyb_>	 and now i repurged from the wiki
[14:24:59] <jeremyb_>	 and *now* it's up to date
[14:25:03] <jeremyb_>	 Nemo_bis: confirm?
[14:51:16] <Nemo_bis>	 jeremyb_: yes, was created just now for me http://p.defau.lt/?YPupBKXw1tDrPMNkYpU_fQ
[14:51:33] <Nemo_bis>	 notice the 11 s wait
[16:41:13] <jeremyb_>	 Nemo_bis: i was more interested in the content of the response... it's the right image?
[16:44:52] <snitch>	 [[Tech]]; DragonflySixtyseven; /* Font sizes and css */ new section; https://meta.wikimedia.org/w/index.php?diff=5443762&oldid=5442093&rcid=4132615
[16:58:05] <Nemo_bis>	 jeremyb_: yes it is, it's enough to check Age:
[16:58:37] <jeremyb_>	 Nemo_bis: errr, maybe. maybe not. better to open it and look if the text changed or not
[16:59:35] <Nemo_bis>	 jeremyb_: I did, but it's enough to check age
[17:00:07] * jeremyb_  grumbles

[17:15:01] <kaldari>	 Reedy: Can you let me know when you guys cut the wmf3 deployment branch?
[17:18:00] <kaldari>	 AaronSchulz: ^
[17:22:58] <Reedy>	 kaldari: Already have
[17:23:12] <kaldari>	 rats :P
[17:24:15] <Reedy>	 Why?
[17:24:25] <Reedy>	 97 minutes ago apparently
[17:25:43] <kaldari>	 you guys start early :)
[17:26:04] <Reedy>	 I'd usually have started it about 3 hours ago
[17:26:20] <Reedy>	 Since Chad tidied up the repos, the building and initial cloning is much much quicker
[17:27:00] <kaldari>	 was just hoping to get a change out on the train, but I'll ask greg about using the lightnight deploy window
[17:27:13] <kaldari>	 er lightning
[17:27:19] <robla>	 Greg's out today
[17:27:26] <Reedy>	 You can push it in now, or just use part of our deployment window
[17:27:36] <Reedy>	 Chances are we don't need much more than the first 30 minutes or so
[17:27:53] <kaldari>	 OK, I'd love to do that if possible
[17:28:14] <kaldari>	 I'll ping you in a little bit
[17:33:18] <Reedy>	 Sure
[17:33:24] <Reedy>	 kaldari: Does it require a scap?
[17:33:30] <kaldari>	 no
[17:33:37] <Reedy>	 Fair enough
[17:33:46] <Reedy>	 Just was going to say I'll need to run scap again for wikidata stuff
[17:33:47] <kaldari>	 it's just a single file
[19:04:41] <kaldari>	 Reedy: I'm ready to do our mini-deployment if the rest of your window is open
[19:05:00] <Reedy>	 Nearly
[19:05:10] <Reedy>	 2nd scap seems to have fixed the l10n cache issues
[19:05:34] <kaldari>	 when did the 2nd scap start?
[19:05:46] <kaldari>	 is it still running?
[19:12:24] <Reedy_>	 kaldari: Should be all good now
[19:12:39] <kaldari>	 Thanks
[19:19:21] <kaldari>	 Reedy_: I'm all done now. Thanks!
[19:22:02] <kaldari>	 superm401, ori-l: Are you guys OK with E2 deploying GettingStarted tomorrow along with all the other Echo related stuff?
[19:22:11] <superm401>	 kaldari, yep, thank you.
[19:22:28] <superm401>	 StevenW is as well.
[19:22:32] <ori-l>	 ditto
[19:40:56] <Krenair>	 Reedy_, https://bugzilla.wikimedia.org/show_bug.cgi?id=44899#c7 namespaceDupes.php?
[19:47:13] <snitch>	 [[Tech]]; DragonflySixtyseven; /* Font sizes and css */; https://meta.wikimedia.org/w/index.php?diff=5444074&oldid=5443762&rcid=4133100
[19:55:23] <Reedy_>	 Krenair: Sort of. Having empty pages in place doesn't help
[19:56:07] <snitch>	 [[Tech]]; DragonflySixtyseven; fix; https://meta.wikimedia.org/w/index.php?diff=5444105&oldid=5444074&rcid=4133141
[20:31:59] <legoktm>	 someone moved a page from userspace into module namespace, but now the fancy highlighting doesnt show up
[20:32:01] <legoktm>	 https://www.wikidata.org/wiki/Module:Label
[20:32:05] <legoktm>	 anomie: ^
[20:32:52] <anomie>	 legoktm: Hmm. 
[20:33:39] <legoktm>	 we both edited after the move and that didnt work either
[20:33:48] <legoktm>	 should I try a delete/undelete?
[20:33:58] <legoktm>	 I'm guessing this is a contenthandler thing?
[20:35:46] <anomie>	 legoktm: Yeah. wikidatawiki is the only one with $wgContentHandlerUseDB true, so it brings its content format along with it instead of determining it from the namespace and page title. The question is how to change that from the UI.
[20:35:52] <apergos>	 I think the content handler is determined by namespace and title of the page
[20:36:09] <^demon>	 I'm looking at the entry in `page` for that wiki.
[20:36:10] <apergos>	 not by any explicit content of model/format info in the db
[20:36:14] <^demon>	 s/wiki/article/
[20:36:14] <legoktm>	 what happens if i delete and undelete the page?
[20:36:23] <apergos>	 oh is this on wikidatawiki? meh
[20:36:29] <legoktm>	 apergos: we're special :P
[20:36:31] <^demon>	 page_content_modle is 'wikitext' for that page.
[20:36:31] <apergos>	 then there yeah
[20:36:46] <apergos>	 so wanna bet move doesn't update that
[20:37:00] <^demon>	 Yep, that'd be my guess.
[20:37:19] <anomie>	 legoktm: You should be able to change it with an API edit, explicitly setting the content model and format. I don't see anywhere in the UI to do it though.
[20:37:46] <legoktm>	 hmm ok, let me try with apisandbox
[20:38:27] <legoktm>	 um
[20:38:32] <legoktm>	 what format should i set it to anomie?
[20:38:41] <anomie>	 legoktm: Set contentmodel=Scribunto, and I'm not sure for contentformat. 
[20:39:09] <legoktm>	 lets see what happens if i leave contentformat blank :P
[20:39:20] <apergos>	 Bad Things :-P
[20:39:21] <MJ94>	 Is the Toolserver down?
[20:39:52] <legoktm>	         "code": "internal_api_error_MWException",
[20:39:52] <legoktm>	         "info": "Exception Caught: Format CONTENT_FORMAT_TEXT is not supported for content model wikitext",
[20:40:58] <^demon>	 anomie: What's ns10?
[20:41:21] <anomie>	 ^demon: ??
[20:41:24] <legoktm>	 https://en.wikipedia.org/w/api.php?action=query&prop=revisions&titles=Module:String&format=jsonfm&rvprop=content <-- says "CONTENT_FORMAT_TEXT"
[20:41:35] <MatmaRex>	 ^demon: usually template
[20:41:36] <legoktm>	 ^demon: 10 is template
[20:41:38] * MatmaRex  has no context again

[20:41:40] <^demon>	 Template, ok.
[20:44:09] <anomie>	 legoktm: Worked for me. Were you trying to use appendtext or something?
[20:44:16] <legoktm>	 yeah
[20:44:19] <legoktm>	 prependtext
[20:44:45] <legoktm>	 guess that wont work
[20:45:13] <legoktm>	 what a lovely diff https://www.wikidata.org/w/index.php?title=Module%3ALabel&diff=32673944&oldid=32669933 :P
[20:45:57] <legoktm>	 thanks everyone :)
[20:46:22] <anomie>	 Speaking of which, that "CONTENT_FORMAT_TEXT" is a bug. I just wonder if fixing it is going to confuse wikidatawiki.
[20:46:38] <^demon>	 anomie: Yeah, something's up with page content models and moving. Got a couple of pages in NS_TEMPLATE that have page_content_model = 'Scribunto';
[20:47:29] <anomie>	 ^demon: ContentHandler when $wgContentHandlerUseDB is true will happily take the old content model along when a page is moved. And you can set it semi-arbitrarily with API edits.
[20:48:02] <legoktm>	 I did file a bug a while back about how you can import pages onto Wikidata into ns0 with the wrong contentmodel
[20:48:13] <apergos>	 CONTENT_FORMAT_TEXT  yeah that's correct, I had to hunt to find an existing module in the wikidata dump
[20:48:23] <^demon>	 Yeah, but should you be allowed to set things semi-arbitrarily like that? It just seems odd that you could mark a page in NS_CATEGORY as Scribunto or wikibase -item.
[20:48:59] <apergos>	 well either you have whatever that config var is on, or off
[20:49:12] <apergos>	 if it's on, you can't arbitrarily mark (or at least it will ignore stupidity like that)
[20:49:20] <apergos>	 if it's off then...
[20:49:20] <^demon>	 There's that :p
[20:49:27] <apergos>	 you takes yer chances
[20:49:47] <^demon>	 So, can we rename the flag to $wgAllowUsersToSetSillyContentModelsThatMakeNoSense? ;-)
[20:50:05] <apergos>	 well
[20:50:22] <apergos>	 we need to strike a balance between descriptive variable names and usable ones dontcha think
[20:50:25] <apergos>	 :-P
[21:11:08] <kaldari>	 AaronSchulz: Hey aaron, we ran into a strange db error when running our maintenance script for Echo. We sort of know the cause of it, but it doesn't make sense. Any chance I could run it by you or someone else?
[21:43:12] <kaldari>	 AaronSchulz: I think this is the problem we ran into: https://bugzilla.wikimedia.org/show_bug.cgi?id=47848
[21:43:30] <kaldari>	 which is a bug that is likely causing other problems as well
[21:48:58] <superm401>	 Is Jenkins down?
[21:49:11] <superm401>	 It's been over an hour since CR +2 on https://gerrit.wikimedia.org/r/#/c/61464/
[21:49:33] <ori-l>	 it's testing it *really* thoroughly
[21:50:25] <superm401>	 ^ hashar
[21:50:53] <hashar>	 are there tests for that extension? ;D
[21:50:54] <ori-l>	 superm401: i explicitly added 'jenkins-bot' as a reviewer; maybe that'll help
[21:51:20] <ori-l>	 it's supposed to pick it up automatically, but maybe it lost its handle on the change stream
[21:51:49] <hashar>	 yeah there are tests and it should react to +2 hmm
[21:52:26] <superm401>	 No unit tests unfortunately (there are browser ones), but that hasn't stopped Jenkins in the past (it still does merge and lint check)
[21:52:50] <hashar>	 poor jenkins is too busy
[22:13:08] <hashar>	 superm401: fixed :-]
[22:13:18] <hashar>	 superm401: you might have to +2
[22:13:37] <superm401>	 Thanks, what was it?
[22:13:52] <superm401>	 ^ hashar
[22:14:13] <hashar>	 superm401: the jenkins web service was locked down due to too many connections 
[22:14:19] <hashar>	 I have restarted the prosy
[22:14:20] <hashar>	 proxy
[22:16:01] <superm401>	 Thanks
[23:28:21] <ebernhardson>	 Say i run 'git review' and it lists something like 20 patches as opposed to just one, what did i do wrong?  screenshot: http://i.imgur.com/GWQ50P7.png
[23:30:16] <MatmaRex>	 ebernhardson: that's a pure black screenshot, but you either merged smething you didn't intend to, or git-review got confused about what is on master
[23:30:43] <MatmaRex>	 ebernhardson: the ultimate solution to this is to remember the git sha1 hash of the change, then run this:
[23:31:06] <MatmaRex>	 ebernhardson: git checkout master; git reset --hard gerrit/master; git pull; git cherry-pick <the sha1 you've remembered>
[23:31:45] <MatmaRex>	 (you might have to replace "gerrit/master" with "origin/master", depending on how your repo is set up)
[23:32:10] <MatmaRex>	 actually make that:  git checkout master && git reset --hard gerrit/master && git pull && git cherry-pick <the sha1 you've remembered>
[23:32:53] <MatmaRex>	 (and you might need to `git reset --hard` first if git complains.)
[23:33:19] <MatmaRex>	 this basically discards all of your changes and resets your master branch to pristine state, then applies the patch.
[23:34:36] <ebernhardson>	 MatmaRex: heh, doh :) shoulda looked at my screenshot first
[23:34:58] <ebernhardson>	 figured it out though, the problem is i have an origin and a gerrit as remotes (even though they point to same place)
[23:35:06] <ebernhardson>	 and i merged from origin, instead of gerrit
[23:35:35] <MatmaRex>	 ebernhardson: `git remote rm origin`. you'll save yourself some headaches
[23:35:56] <ebernhardson>	 MatmaRex: excellent, doing that now
[23:36:06] <MatmaRex>	 (this kills the remote, of course.)
[23:36:23] <ebernhardson>	 yup
[23:42:23] <RoanKattouw>	 ebernhardson, MatmaRex: An easier workaround is 'git fetch gerrit'
[23:43:30] <MatmaRex>	 what i posted is the *ultimate* solution. ;)
[23:43:55] <MatmaRex>	 good for when you have no idea what happened to your repo
[23:44:02] <ebernhardson>	 i have actually been using hard resets to fix my review problems in last few days,  although i was manually finding the right one in git log 
[23:44:05] <MatmaRex>	 and you just want it to work already
[23:44:15] <ebernhardson>	 hard against gerrit/master is wonderful idea, why didnt i think of that :)
[23:44:30] <MatmaRex>	 `git reset --hard gerrit/master` has become my best friend when working with gerrit
[23:45:14] <MatmaRex>	 (i forget or don't bother to `checkout -b` way too often)
[23:53:29] <sDrewth>	 thx StevenW, had meant to reply singly, but hit the wrong reply-to button, then had an ohnosecond
[23:54:16] <StevenW>	 sDrewth: no problem
[23:58:46] <sDrewth>	 has anything been changed overnight that would have an impact on English Wikisource?  I am seeing my old toolbar set lose its ability to have additional buttons