{htmlTitle}

fun" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5032 [15:45:09] jdlrobson, ^^ [15:45:30] YuviPanda: are patrick's pull requests relevant given the move to the api? [15:45:53] * YuviPanda peeks [15:46:17] jdlrobson: 'page normalization'? [15:46:18] nope [16:01:16] New review: Jdlrobson; "(no comment)" [mediawiki/extensions/MobileFrontend] (master) C: 1; - https://gerrit.wikimedia.org/r/5032 [16:10:45] New review: Jdlrobson; "Only thought is that we should possibly pull in jQuery using a wget / curl rather than storing in th..." [mediawiki/extensions/MobileFrontend] (master) C: 1; - https://gerrit.wikimedia.org/r/5011 [16:11:48] scrolltop seems to have no effect... [16:12:09] New patchset: L10n-bot; "Localisation updates from http://translatewiki.net." [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5068 [16:12:13] New review: gerrit2; "Auto-approving/merging l10n updates" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5068 [16:12:13] Change merged: gerrit2; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5068 [16:13:15] New review: Reedy; "MediaWiki itself includes jQuery... You could just serve that up" [mediawiki/extensions/MobileFrontend] (master); V: 0 C: 0; - https://gerrit.wikimedia.org/r/5011 [16:18:11] New review: Jdlrobson; "Agreed! It would make sense to use this instead" [mediawiki/extensions/MobileFrontend] (master) C: 1; - https://gerrit.wikimedia.org/r/5011 [16:19:47] brb [16:26:49] preilly: We just released vumi 0.4 -- it might be a good idea to switch to that instead of the snapshot. [16:27:29] (I don't really have the time to build a deb for it this week, though.) [16:27:37] * jerith heads out to band practice. [16:27:44] New review: Reedy; "That seems sensible, especially as it's something happening in the near future, and as such, isn't w..." [mediawiki/extensions/MobileFrontend] (master); V: 0 C: 0; - https://gerrit.wikimedia.org/r/5011 [16:28:31] jerith: okay [16:29:02] preilly: The difference is really just that one is a more reliable reference point in the commit history. [16:29:03] New review: preilly; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5029 [16:29:05] Change merged: preilly; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5029 [16:29:35] New review: preilly; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5030 [16:29:36] (There are some fixes and improvements, but nothing relevant to the wikipedia app.) [16:29:37] Change merged: preilly; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5030 [16:29:42] * jerith really heads out now. [16:31:22] New review: preilly; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5032 [16:31:24] Change merged: preilly; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5032 [16:34:11] New review: preilly; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5011 [16:34:13] Change merged: preilly; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5011 [16:40:41] * YuviPanda heads to the doctor [16:40:46] might miss the standup, brb [16:42:06] might be of interest: http://bradfrostweb.com/blog/mobile/test-on-real-mobile-devices-without-breaking-the-bank/ It's at least a good list of platforms. (via Jonathan Kohl on Twitter just now) [16:58:15] tfinc: I'm not going to be able to make the stand up [16:58:41] preilly: because of the 10-11 testing? [16:58:44] tfinc: I'm in the middle of these varnish changes and zero related push [16:58:50] [16:58:52] preilly: k [16:59:01] did we lose a Reedy ? [16:59:19] Depends what you mean by "lose" [16:59:26] Just haven't spoken to xyr yet. [16:59:51] Amgine had me worried there [16:59:55] :) [17:00:10] Reedy: when trying to get pages recently created via en.m.wiktionary.org, they are not found. Is this slave lag? [17:00:59] lets do our standup [17:01:40] It could be lag, but unless it's really bad, it wouldn't be an issue [17:03:03] For sure 1 hour+ [17:03:22] That's not slave lag [17:03:29] If it was that bad, people would be screaming [17:03:35] kk. [17:03:48] Do they appear via non mobile methods? [17:04:01] non-MF? yes. [17:05:12] Sounds like it's cache of something in the api methods used [17:05:27] Bug report it? [17:12:34] Via search? [17:12:43] I thought you meant direct access [17:12:49] It's possible lucene is borked [17:14:14] I just got two terms more than 8 hours old. [17:14:33] (they may have had multiple edits, dunno.) [17:20:04] tfinc: do you know if the platform team moving the rest of the cluster to the 1.20wmf1 branch today? [17:20:33] awjr: i do not but you can ask robla now or i can ask him in 10min [17:38:04] awjr: its still going out in stages … commons coming up .. en wiki next week [17:38:28] tfinc: thanks - robla reminded me it was all on the deployment calendar [17:49:47] Project WiktionaryMobile - Nightly builds build #87: SUCCESS in 8.1 sec: https://integration.mediawiki.org/ci/job/WiktionaryMobile%20-%20Nightly%20builds/87/ [17:49:48] pfhayes: Fix for trying to get starting word on non-android platforms [17:53:24] tfinc: heya [17:57:23] welcome YuviPanda [17:57:31] YuviPanda: app is still in review state [17:57:55] YuviPanda: can you sync up with the iOS5.1 users who are tweeting about scrolling issues [17:58:19] yeah, will do [18:00:16] YuviPanda: did my last message go through ? [18:00:26] sync up with iOS 5.1 users on twitter [18:00:28] was the last one [18:00:29] yes [18:00:36] tfinc: responding to them now [18:00:40] YuviPanda: thanks [18:12:25] awjr, has everything from http://www.mediawiki.org/wiki/Extension:MobileFrontend/Deployments#12_April.2C_2012 actually been deployed? [18:13:00] MaxSem I have no idea, check with preilly [18:13:08] oh, right [18:17:06] MaxSem: yes [18:17:08] preilly ^^ [18:31:14] YuviPanda: just saw your mail … you doing ok? [18:31:40] tfinc: painkillers for the night. It's not broken. [18:31:48] YuviPanda: take it easy [18:32:01] unable to use a hand though [18:32:28] YuviPanda: since you couldn't find a 3G i'm just going to buy one [18:32:36] working on a few of the things jon wanted fixed before crashing [18:32:37] and ill either send it to you or bring it to berlin [18:32:41] tfinc: cool [18:33:05] berlin is a month and a half away though [18:33:20] hows that vs indian customs ;) [18:33:41] tfinc: I also think i will be moving away from PDT to more of Jon's time zone [18:33:54] so will get to spend time with him and then SF office for the morning as well [18:33:59] YuviPanda: as long as you make the standup thats fine [18:34:02] yea [18:34:23] YuviPanda: http://www.ebay.com/ctg/Apple-iPhone-3G-8GB-Black-Unlocked-Smartphone-/100014203?_dmpt=Cell_Phones&_pcategid=9355&_pcatid=801&_refkw=iphone3g&_trkparms=65%253A12%257C66%253A2%257C39%253A1%257C72%253A6064&_trksid=p3286.c0.m14 [18:34:59] tfinc: ok [18:40:00] New patchset: awjrichards; "Merging from master at 5ea662f03af3034af3c0c89424163ffa0db42960" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5115 [18:40:39] Change abandoned: awjrichards; "wrong branch" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5115 [18:42:57] tfinc: I'll be crashing in a while when the pain killers work in. since i missed the standup: 1. worked fixing bugs jon spotted to fix api branch before merging 2. Found a nasty scrolling regression on android (in API move branch), investigating that 3. Talked with Jon about how to implement reference reveal with the new on-demand DOM loading 4. Implemented a version of 'fast click' so that people get instant touch responses (the 'lag' issue) [18:43:02] will continue with (2) and (1) tomorrow [18:43:07] ^ resending [18:43:34] YuviPanda: i'm going to ask Rachel about import fees before hitting buy [18:43:58] yeah, i am not sure how complicated it will be [18:44:05] YuviPanda : k .. i'm going to send that on your behalf to mobile-tech [18:44:10] ok [18:44:15] thanks [18:49:51] YuviPanda: wow .. Indian customs are so arbitrary [18:50:00] for electronics [18:50:55] :) [18:52:06] tfinc: http://products.ebay.in/iphone-3g?_trksid=p2041978&_rdc=1 [18:52:28] YuviPanda: how much do you trust this seller ? [18:53:25] PaisaPay is supposed to be safe [18:53:44] however, i've never bought anything from there. Do not personally know anyone who has either [18:54:12] lifeeth: how reliable is ebay.in here? [18:54:57] WTF, git-review bails out on push stating it can't apply a long-merged commit [18:57:00] MaxSem: hmm, that's pretty weird [18:57:19] hey YuviPanda [18:57:31] YuviPanda : its pretty safe -- just check the seller reputation [18:57:34] MaxSem: what is the CLI output? [18:57:44] tfinc : tell me about the customs :) [18:57:54] lifeeth: http://www.ebay.in/itm/190667701820#ht_1463wt_922 [18:57:57] tfinc : I have had my share of trouble trying to run a tiny electronics firm [18:58:07] 1 bobcat per 20 iPhones? [18:58:15] preilly, http://dpaste.com/732650/ [18:58:22] YuviPanda : You want a 3G right? [18:58:27] lifeeth: yes [18:59:12] YuviPanda : There is no bill or warranty [18:59:22] but 94.6 % positive reviews so [18:59:26] ough, that too [18:59:41] MaxSem: did you try git review-R [19:00:16] MaxSem: I mean, "git review -R" [19:00:45] preilly, http://dpaste.com/732652/ [19:01:29] MaxSem: what happens if you git commit --amend [19:01:59] * preilly — will brb [19:05:31] fuck you git [19:05:50] i too am battling git. [19:06:15] preilly: im having a hard time merging changes from trunk into the contact-us-redesign remote branch again [19:06:44] preilly: does this sound like the correct workflow for getting changes from master into the remote branch: [19:07:03] git checkout [19:07:13] git pull origin master (to pick up changes from master) [19:07:25] # fix conflicts [19:07:36] git review -R [19:07:37] ? [19:08:14] or do i actually need to rebase against… something, like the last merged commit in the remote branch/ [19:09:00] * MaxSem thinks he had lost 2 hours' work in those rebases [19:10:00] once again, fuck you git and your history rewriting [19:10:13] * MaxSem starts redoing everything [19:11:43] * jeroid avoids rebase on general principles. [19:12:01] jeroid, tell that to git-review [19:12:45] tfinc: replied to jon's email. Am heading to sleep. Good night [19:12:50] night YuviPanda [19:13:21] awjr_lunch: that seems logical [19:13:49] I don't know git-review. [19:14:11] jeroid, you're lucky! [19:14:21] We use github for that kind of thing. [19:16:47] woot .. apple approved our expedited review [19:18:23] We also avoid having lots of different people working on the same branch. [19:20:00] tfinc: sweet [19:20:14] preilly: dan came by and said we could shut down the test [19:20:31] So there's very little need to rebase. [19:20:47] * tfinc goes to pickup lunch [19:24:44] * preilly thinks tfinc is lying about picking up lunch [19:25:02] * preilly but, not as bad as our office wifi lies [19:25:11] * tfinc goes to prove preilly wrong [19:28:09] Bet xe comes back with a Ford. [19:30:12] New patchset: MaxSem; "Fixed tests broken by previous commits" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5123 [19:30:54] New review: preilly; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5123 [19:30:57] Change merged: preilly; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5123 [19:58:41] tfinc: I created the following RT ticket: http://rt.wikimedia.org/Ticket/Display.html?id=2826 [20:00:46] brion: https://office.wikimedia.org/wiki/Engineering/Mobile/Testing_Devices [20:07:40] checked out & charging [20:11:48] New patchset: awjrichards; "Resolving merge conflicts from sync from master" [mediawiki/extensions/MobileFrontend] (contact-us-redesign) - https://gerrit.wikimedia.org/r/5125 [20:12:26] awjr: what is with https://gerrit.wikimedia.org/r/#change,5125 [20:12:28] Change abandoned: awjrichards; "(no reason)" [mediawiki/extensions/MobileFrontend] (contact-us-redesign) - https://gerrit.wikimedia.org/r/5125 [20:12:57] preilly im trying to get changes in master sync'd with contact-us-redesign [20:13:22] awjr: well, that was an empty changeset [20:13:35] preilly: yes, which is why i abandoned it. [20:16:56] awjr: roger [20:23:47] awjr: are you still having issues getting that merged in? [20:24:20] preilly: yeah but im hoping this round is going to be ok [20:24:26] im still cleaning up conflicts etc [20:24:53] awjr: hmm [20:25:02] we should probably be syncing to master like, daily [20:25:10] or from mater, rather [20:25:20] awjr: yeah, from master [20:25:43] so preilly, i did a git pull origin master (on my local contact-us-redesign) [20:25:49] which had a bunch of merge conflicts, which i cleaned up [20:26:08] and then ran git rebase -i 0efdb21438618b9ec7e255e7478616b91656c3b1 [20:26:17] 0efdb21438618b9ec7e255e7478616b91656c3b1 was the last merged commit on the remote branch [20:26:37] awjr: this one https://gerrit.wikimedia.org/r/#change,4318 right? [20:27:04] and am now cleaning up more conflicts - but git keeps trying to apply things that have already been applied, which results in something like "Could not apply 7ad9f01... re-enabled toggling on the footer" [20:27:14] but a git rebase —continue seems to just do the trick [20:27:23] preilly, correct [20:27:26] awjr: yeah [20:27:31] awjr: so, is it working now? [20:27:37] still getting through the conflicts [20:29:17] did you try a git merge master? [20:29:40] preilly no i did not [20:29:50] preilly should have i done that instaed of git pull origin master? [20:33:00] awjr: yes [20:33:39] awjr: the other way you probably have broken the ability to do a fast-forward merge [20:33:51] preilly interesting - why is that? [20:34:08] awjr: basically disparate commits, [20:34:18] and is that why by git rebase is wonky and trying to apply things that have already been applied? [20:34:29] yeah [20:34:33] ok [20:34:34] fml [20:34:35] so [20:34:40] the workflow should be: [20:34:49] git checkout [20:34:51] git merge master [20:35:01] git rebase -i 0efdb21438618b9ec7e255e7478616b91656c3b1 [20:35:05] git review -R contact-us-redesign [20:35:06] ? [20:35:23] yeah [20:35:54] * preilly okay, I'm getting food [20:45:27] preilly, are you sure format=json is still used? https://graphite.wikimedia.org/render?width=500&from=-1hours&until=now&height=380&target=ExtMobileFrontend.DOMParse-json.count [20:46:51] sigh [20:47:01] preilly i just tried what we talked about and got the following: [20:47:02] ! [remote rejected] HEAD -> refs/for/contact-us-redesign/contact-us-redesign (no new changes) [20:47:02] error: failed to push some refs to 'ssh://awjrichards@gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend.git' [20:49:04] oh i think because i missed a conflict [20:54:46] preilly: im seeing the same behavior with the workflow we just talked about [20:59:17] preilly: when you get back, what do the wiktionaries need to do to make content visible on their main page? [20:59:28] in mobile frontend [21:02:00] Amgine: http://meta.wikimedia.org/wiki/Mobile_Projects/Mobile_Gateway#How_do_I_format_a_mobile_homepage.3F [21:02:23] ty tfinc [21:03:04] awjr: has IT done your SSD switch yet? [21:03:27] wow that is english wikipedia centric. [21:03:33] tfinc no but chip mentioned to me on friday that they ordered me the hd [21:04:46] Amgine: its really not. read the global prefix section [21:05:06] I am. [21:05:18] tfinc i think chip is having the ssd sent directly to me and i will do the replacement myself [21:05:34] awjr: let me know how it goes as i'm looking to do the same on an old laptop [21:05:45] tfinc will do [21:05:59] i've been looking at this drive http://www.newegg.com/Product/Product.aspx?Item=N82E16820148449 [21:06:09] recommend it to chip too [21:06:25] oo [21:06:35] IT wasn't willing to go bigger than 128gb [21:06:37] for me at least [21:06:49] i'm trying to update this winphone7 device to 7.5... wish me luck [21:07:00] * awjr wishes brion luck [21:07:08] \o/ [21:07:18] awjr: 256GB is still pricey but falling fast [21:07:34] much faster then traditional drives ever did [21:07:43] it gave me a cryptic error message which turned out to be "the clock on your phone is set two years off" [21:07:45] nice [21:07:53] so given a couple more months we should see sub $300 256GB + drive [21:07:54] s [21:08:03] no doubt [21:09:23] but i've been able to make the old laptop work nicely as long as i use flash bock, piano bar, … last part is speeding up the drive to SSD [21:09:29] [21:10:35] tfinc: flash bock? [21:10:42] block* [21:10:51] oic [21:10:52] flash kills the cpu on that laptop [21:10:57] what is this old laptopt? [21:11:06] last non unibody mac [21:11:41] oh wow - i have an old aluminium powerbook (pre-intel) that is barely limping along still [21:12:15] i *almost* miss my old g4 powerbook... except my macbook air wipes the floor with it now :) [21:12:34] lol [21:13:37] awjr: this will come in hand once i buy the SSD http://www.ifixit.com/Guide/MacBook-Pro-15-Inch-Core-2-Duo-Models-A1226-and-A1260-Hard-Drive-Replacement/670/1 [21:13:53] pretty sure its an A1226 or A1260 [21:14:13] awjr: make sure they send you a T6 Torx Screwdriver [21:14:39] tfinc: hd replacment on my model is much easier :p [21:14:49] nice [21:15:10] jebus it looks like you have to entirely disect the thing [21:15:53] mwmw … read the product overview http://www.ifixit.com/MacBook-Parts/MacBook-Pro-15-Inch-Model-A1226-Display-Assembly/IF185-068?utm_medium=frame_module_bottom&utm_term=macbook_pro_15%22_core_2_duo_models_a1226_and_a1260&utm_source=ifixit_guide&utm_content=related_products [21:17:30] hahaha [21:17:59] tfinc do you know if jon robson will be around later today or is he gone all day? [21:18:09] he's gone [21:18:11] js meetup [21:18:17] he sent mail to mobile-tech [21:19:49] tfinc: i know but whether or not he'd be around this afternoon (particularly for deployment) seemed ambiguous from his email, was curious if you had more insight [21:21:57] awjr: i wouldn't count on him being around [21:22:30] k [21:22:32] thanks [21:25:37] brion: handy link for whenever you get to it https://github.com/wikimedia/WikipediaMobile/pull/208#issuecomment-5159891 [21:26:02] \o/ [21:26:03] there is some great back and forth between yuvi and jon already [21:27:47] New patchset: MaxSem; "Switch to RequestContext, ditch $wgUser, $wgRequest and $wgOut" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5133 [21:33:39] yeah, looks like windows phone 7 installs the updates in sequence, one at a time [21:33:54] instead of, oh, rolling them up and applying one giant update [21:34:01] or downloading them all and installing them automativcally [21:35:31] MaxSem: thanks for responding to Jonas [21:42:27] MaxSem, preilly: changes for today's deployment are live on test.wikipedia.org - please test [21:47:39] oops forgot to minify js [21:50:12] ok fixed [21:52:32] awjr, jquery-1.7.2.min.js is still a 404 [21:53:08] MaxSem it is working for me [21:53:37] awjr, https://test.wikipedia.org/w/extensions-1.19/MobileFrontend/javascripts/jquery-1.7.2.min.js [21:53:59] yes, it shows me jquery 1.72.min.js :p [21:54:16] MaxSem ^ [21:55:05] awjr, then it's esams [21:55:21] just checked in another browser [21:55:31] same problem? [21:55:35] yup [21:55:35] that is very strange. [21:57:04] awjr, loaded for me with query appended [21:58:37] phew [21:58:54] this is strange [21:59:35] footer stuff is still busted in RTL languages - is that a deployment blocker? [21:59:59] sinec RTL in general is inda busted in MF [22:00:03] *since [22:00:56] preilly ^ [22:00:58] MaxSem are you still seeing weirdness? [22:01:58] New patchset: MaxSem; "Append version to jQuery URL" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5134 [22:05:25] awjr, tried wget from toolserver - same crap [22:06:19] http://dpaste.com/732777/ [22:06:57] awjr, see the commit^^^ [22:07:24] MaxSem very strange - it is working fine for me here. maybe ask about esams in #wikimedia-operations? [22:07:33] MaxSem is that commit necessary? [22:07:52] awjr, at least it would fix the problem for me and TS [22:07:53] :P [22:08:11] awjr, have you scapped, I see changes on enwiki [22:08:58] MaxSem no i have not scapped [22:09:21] MaxSem and i see no log msgs in #wikimedia-tech [22:10:28] MaxSem i do not see changes on enwiki -for instance, enwiki is still requesting jquery-1.7.1.min.js [22:11:03] yup, false alarm [22:11:56] New review: awjrichards; "(no comment)" [mediawiki/extensions/MobileFrontend] (master); V: 1 C: 2; - https://gerrit.wikimedia.org/r/5134 [22:12:09] Change merged: awjrichards; [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5134 [22:14:14] MaxSem that change should now be live on testwiki [22:15:56] yes, this seems to have solved the problem [22:17:19] awjr, moar fun: cookies don't seem to stick [22:17:55] MaxSem: describe the behavior you're seeing? it might be the known issue with browser caching on single-domain sites [22:18:08] repro: load testwiki with a fresh browser, click mobile view, click home [22:19:02] same stuff works on my single-domain dev wiki [22:19:31] MaxSem actually works fine for me in FF on os x [22:19:44] Opera and Safari/Win [22:20:25] what happens if you hard-refresh? [22:20:58] hmm, works [22:21:08] yeah it's your browser cache [22:21:35] consistence of user (mis)experiense is scary [22:21:46] yes it is [22:22:09] short of getting mediawiki to properly support etags i haven't thought of or heard a solution to that problem [22:22:37] the good news, though, is that in production on the cluster it should not be a problem sine that behavior is not present on sites with separate mobile domains [22:23:35] preilly: are you seeig any deployment blockers? [22:23:38] *seeing [22:23:57] awjr: is this https://gerrit.wikimedia.org/r/#change,5133 in the mix at all? [22:24:16] preilly no, should it be? [22:24:26] it shouldn't [22:24:30] MaxSem: okay [22:24:38] awjr: yeah, I think things look good [22:24:54] preilly the only thing i've noticed is that the footer is messed up for RTL languages [22:25:10] but wasn't sure if that's a deployment blocker since MF is kinda messed up for RTL languages anyway [22:25:31] awjr: yeah, I'd so it's okay based on what we've already got [22:25:51] preilly ok [22:26:08] MaxSem: 77 » » » {htmlTitle} [22:26:10] we should connect jdlrobson with aharoni [22:26:16] preilly also - since some sites are running 1.20wmf1, do i need to do anything special to get changes pushed to them? [22:26:18] MaxSem: in https://gerrit.wikimedia.org/r/#patch,sidebyside,5133,1,templates/ApplicationTemplate.php [22:26:34] awjr: you need to update the sub module [22:26:40] preilly how do i do that? [22:26:59] awjr: check out core [22:27:12] there is nothing in the deployment documentation about it [22:27:21] preilly can you add it? [22:27:27] http://wikitech.wikimedia.org/view/How_to_deploy_code [22:28:25] awjr: have you done this: git checkout -b wmf/1.20wmf1 origin/wmf/1.20wmf1 [22:28:40] awjr: I think it would be best if Roan or someone else did that [22:28:50] preilly: i have not [22:29:02] awjr: then git submodule init [22:29:18] awjr: then git submodule update extensions/MobileFrontend [22:29:56] awjr: git commit -a [22:30:28] awjr: skip that last part [22:30:37] awjr: cd extensions/MobileFrontend [22:30:39] awjr: git pull [22:31:12] awjr: then git checkout origin/master [22:31:19] awjr: then cd back out [22:31:24] awjr: git commit -a [22:31:36] awjr: then try git push origin wmf/1.20wmf1 [22:31:46] awjr: if that fails use git review [22:31:53] awjr: does that makes sense to you? [22:32:01] New patchset: MaxSem; "Switch to RequestContext, ditch $wgUser, $wgRequest and $wgOut" [mediawiki/extensions/MobileFrontend] (master) - https://gerrit.wikimedia.org/r/5133 [22:32:06] preilly sort of - i'm not seeing origin/wmf/1.20wmf1 as a remote branch [22:32:27] preilly, fixed^^ [22:32:29] awjr: git pull [22:32:33] MaxSem: thanks! [22:32:51] oh duh [22:34:42] preilly: [22:34:43] awjrichards@virtualbot:~/Dev/1.19wmf1$ [wmf/1.20wmf1]$ cd extensions/MobileFrontend/ [22:34:43] awjrichards@virtualbot:~/Dev/1.19wmf1/extensions/MobileFrontend$ $ git pull [22:34:43] You are not currently on a branch, so I cannot use any [22:34:43] 'branch..merge' in your configuration file. [22:34:43] Please specify which remote branch you want to use on the command [22:34:43] line and try again (e.g. 'git pull '). [22:34:43] See git-pull(1) for details. [22:35:14] preilly after i got that i did: [22:35:16] awjrichards@virtualbot:~/Dev/1.19wmf1/extensions/MobileFrontend$ $ git branch [22:35:16] * (no branch) [22:35:16] master [22:35:16] awjrichards@virtualbot:~/Dev/1.19wmf1/extensions/MobileFrontend$ $ git checkout master [22:35:16] Switched to branch 'master' [22:35:17] awjrichards@virtualbot:~/Dev/1.19wmf1/extensions/MobileFrontend$ [master]$ git pull [22:35:17] Already up-to-date. [22:35:31] why are you in 1.19wmf1? [22:35:43] hahaha im not [22:35:51] it's just the name i gave the dir a long time ago [22:36:00] awjr: okay [22:36:04] awjr: so, you did this git checkout -b wmf/1.20wmf1 origin/wmf/1.20wmf1 [22:36:15] then then git submodule init [22:36:25] then git submodule update extensions/MobileFrontend [22:36:32] cd extensions/MobileFrontend [22:36:36] then git pull [22:36:49] almost [22:36:55] preilly i had to git checkout master before git pull worked [22:37:22] use git fetch instead [22:37:44]

History of China