[00:03:44] Yeah, that's totally fine [00:27:26] heatherw: I need to take off now but we can keep corresponding through email if that works for you [00:27:46] sure, i'm almost done and i'll email it to you [00:27:59] Okay thanks! [05:54:21] brion_: around? [07:33:30] [WikipediaMobile] yuvipanda pushed 1 new commit to master: http://git.io/Y0qpHw [07:33:30] [WikipediaMobile/master] Merge pull request #139 from Dante-101/null-point-fix - Yuvi Panda [09:47:57] Andre_Engels, is everything ok? [09:48:19] A bit of frustration... Getting better again [10:18:21] hi Andre [10:18:34] hi [10:18:35] did you get to login on stat1 yet? [10:18:54] you should be able to by now [10:19:01] well, stat1 had your home dir , i checked that [10:19:14] Hmmm... I tried it about 5 minutes ago, but didn't work yet. [10:19:17] but last night it wasnt created on the bastion host fenari yet [10:19:25] via fenari or direct? [10:19:49] let me check [10:19:52] direct [10:20:13] tried to SSH to stat1.wikimedia.org [10:20:28] If that's not the way of connecting, please tell me what is. [10:20:41] we'd like everybody to connect via the bastion host and disable the direct login [10:21:00] or it would kind of defeat the purpose of the bastion host [10:21:16] but that would be a change.. we need to talk to ezachte about it too [10:21:22] Ok, so I go to bastion, and then from there ssh to - which name? stat1? [10:21:29] yes, just stat1 [10:21:43] i'm checking if your home was created on the bastion [10:22:01] hmm, it wasn't [10:22:06] ssh: Could not resolve hostname stat1: Name or service not known [10:22:42] from where did you try? bastion.wmflabs ? that would be the wrong bastion host [10:22:49] because stat1 is a live server [10:23:17] but wait.. one by one..lets first check why the direct login didnt work [10:23:34] brb [10:24:35] Yes, bastion.wmflabs. Where is the one that I should have? [10:24:36] Andre_Engels: ok, can you please just try to connect once again as you did earlier (direct) [10:25:06] Nope, same issue [10:25:22] i dont see a failed login on the server side [10:25:47] what is the error you get? [10:25:59] ah there you are [10:26:05] Invalid user a_engels [10:26:09] try aengels :) [10:26:39] Same issue [10:26:55] Disconnected: No supported authentication methods available (server sent: publickey) [10:27:22] ok, how did you connect? [10:27:40] using ssh on the commandline? putty? [10:27:44] Putty [10:27:55] do you use pagent.exe as well? [10:28:09] eh pageant [10:28:15] yes [10:28:16] it comes with the full putty install [10:28:37] It has two keys loaded [10:29:01] identified as rsa-key-20110116 and rsa-key-20120206 [10:29:11] hmm, the error sounds like your client is not tryint to use pubkey [10:29:21] and the server says "public key"-only, sry [10:30:30] you could try, just for testing, to not use pageant, and instead specify the key in putty itself [10:31:01] Ok, will try that. [10:31:26] but still strange, if it works fine for you like that to connect to other boxes, like labs bastion [10:32:03] maybe i did cut off a character from your ssh key when copy/pasting ..checking again [10:32:46] Try failed, and I even never got to be asked the password [10:33:16] We had problems with this key before, maybe the private and public keys are not connected as I thought they would be? [10:33:30] you mean the passphrase for the key? right [10:33:40] Yes, that's what I mean [10:33:56] hmm..ok.. and i accidentally put some whitespaces in it ,,but fixed that yesterday [10:34:12] and it looks ok ..comparing to your file attachment once again [10:35:28] I could give you the public key for the other key, we might try that if it's not too much work. [10:35:32] Andre_Engels: do you have access to any other box, where you could just put in this key yourself and try if it works with your private key ? [10:36:20] Not really, I have no experience with that side of key usage... [10:36:29] i'd like to do that only if we know we cant keep this one, because even though its not much work to replace it, we will have to leave the old one in there, defined as "absent"/deactivated ..forever [10:36:44] or puppet will not remove it [10:36:55] Blergh. [10:42:04] one moment... [10:43:58] Can we compare the public keys, just to check it's the right one? [10:44:37] yea, i am uploading your key file to the server now and doing a diff to the one placed there via puppet [10:45:22] it's the same [10:45:32] then please tell me your again [10:46:32] ---- BEGIN SSH2 PUBLIC KEY ---- [10:46:34] Comment: "rsa-key-20110116" [10:46:36] AAAAB3NzaC1yc2EAAAABJQAAAIEAr1eQ0RVBqW016RmPH8KdJrAYUndDCabdYjKN [10:46:38] CqTq38eAySGGjhdszq8gLK+b6q10SCVlghDAQUT4xzjS4BZqIS9dxijM9dY1qutg [10:46:39] Vm/P3qD20nHGl1z033E2gRRkUpiJZel8JJa8VjtWWMiyCK9F0sissbuKWjIRI0Pb [10:46:41] QifCVs8= [10:46:43] ---- END SSH2 PUBLIC KEY ---- [10:47:16] that looks different ^^ [10:47:17] (most of the carriage returns having been created by the irc program) [10:47:42] Hmmm... So I gave Diederik the wrong one? [10:47:57] ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvmCrMfy+q3k/QCG3T72Q1+BhnsLFBSFzkDt2fMouweztuaFEAGA3KqYiJM5P4cm81ObjU2Nt8wac8vRWhGjmI6cOUl6Q3TD8/Cry9ZOQB9aQ80vYuDYCNReD+j0sQdGfb+T5OGsIVz0yB7H/COJ9mNcxqXIjChG17FxJcp4RfhOH0mWQiYQ61ZGMLn1MUOZC/tV6CypVFpnuTvVNtmqeBJQYWR9Q8+lLjEG14to/gyYR/3958RGFZgk0Byz0G8E0yYEg6PGZYSMEVTEOEqP6JNflqk4XK94pFmRfHt8rDs7cFTqa2Kn6etAiShvZ5/rQuEoveU6mQtnkaoVvARVgHQ== a_engels@i-000000ba [10:48:22] well, this is also a different format, the one for openssh (you can also see that in puttygen, for copy/pasting) [10:48:30] but besides that, it also looks like a different key [10:49:29] can you find theprivate one that looks like it is called "a_engels@i-000000ba"? [10:49:47] and make sure that is loaded in pageant then [10:50:19] or just load all the private ones you have;) [10:51:03] eh, well, maybe i should not recommend to load all either.. but you know.. [10:51:30] As far as I can see I have only 2 privates, and they are both loaded... [10:52:50] can you use puttygen, and load your existing private key [10:52:59] (instead of creating a new one) [10:53:10] but load it and look at the section "‘Public key for pasting into authorized_keys file’" [10:53:17] and then compare that to what i pasted above [10:53:17] Yes, I've been doing it several times [10:53:57] Different... [10:54:03] ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAr1eQ0RVBqW016RmPH8KdJrAYUndDCabdYjKNCqTq38eAySGGjhdszq8gLK+b6q10SCVlghDAQUT4xzjS4BZqIS9dxijM9dY1qutgVm/P3qD20nHGl1z033E2gRRkUpiJZel8JJa8VjtWWMiyCK9F0sissbuKWjIRI0PbQifCVs8= rsa-key-20110116 [10:54:10] but they dont look like the "a_engels@i-000000ba" one? ok, well then you dont appear to own the matching private key [10:54:18] give me another one then [10:54:34] so you want to use that one? [10:54:54] or make a new one? now we are replacing it anyways [10:55:16] you could name it "stat1-key" or something [10:56:44] I could make a new one I guess, might be marginally saver [10:57:03] yea [10:59:07] You have an email address where I can send the new public key? [10:59:14] lets move to query [10:59:14] Or would it work to get it from here? [10:59:21] query? [10:59:23] we are kind of off-topic here anyways [10:59:38] Ah, a private channel you mean [11:21:45] yuvi! [11:27:11] MaxSem! [14:32:32] hi yuvipanda [14:39:43] pfhayes: heya [14:39:55] pfhayes: how did the standup go? Apologies i've not been around for them for a while (Travelling) [14:40:09] no problem, it went well. amine should be sending out logs soon [14:40:19] we have the new repository up and running [14:41:05] yuvipanda: we discussed code review and pull requests. dlemieux and I have some outstanding pull requests on wikimedia/WiktionaryMobile we were hoping you (or someone else from WMF) could sign off on before we merge them [14:43:55] pfhayes: let me check [14:44:52] pfhayes: did you do a rebase? [14:45:06] pfhayes: we killed the sprites (afaik) so that should no longer apply cleanly... [14:45:45] i see. dlemieux was working on that yesterday so comment on that or mention it to him so he can update that [14:46:17] yuvipanda: as far as rebasing, i did do one earlier [14:46:27] i have been getting a -lot- of conflicts though with successive rebases [14:47:21] pfhayes: the same conflicts again and again? [14:47:23] or new ones? [14:47:26] yes [14:47:28] same ones [14:47:50] whenever i did a rebase, it would rebase the entire wiktionary commit history [14:48:22] hmm, that's not supposed to happen... [14:48:35] how are you doing the rebase? [14:48:38] pull -r? [14:48:41] or just fetch and rebase? [14:50:45] i was doing pull --rebase [14:51:19] this was to pull in the upstream WikipediaMobile changes [14:52:41] hmm, that should technically work and not make you rebase everytime [14:52:50] let me check [14:53:26] pfhayes: in the meantime, consider yourself free to merge the pull requests. The major thing you guys would need to keep in mind is to keep up to date with our master... [14:53:38] okay [14:53:41] speaking of that, did amgine__ talk to you guys about a 'feature freeze'/'features list' of sorts? [14:53:50] yes, that was brought up [14:54:17] we determined that there were no more necessary features we needed to add for v1 [14:54:30] afaik, i wasn't there for the whole meeting [14:54:38] you should be able to check the logs [14:55:10] pfhayes: ah [14:55:19] pfhayes: do you have a link to the logs? [14:55:46] http://www.mediawiki.org/wiki/UCOSP_Spring_2012/Standups/14_Feb [14:57:47] pfhayes: thanks! [14:57:53] no problem [14:57:58] * yuvipanda reads [14:58:34] yuvipanda: i was going to do some work on making migration earlier, as we discussed, by submitting a patch that reduces the js base to only one occurrence of 'wikipedia'. have you done any work on that already? [15:00:21] pfhayes: I have it in a stash here somewhere. I promise to commit that by tonight [15:00:58] ok [15:13:37] yuvipanda: are you set up to watch the WiktionaryMobile repo? do you get notified of new incoming pull requests? [15:13:52] also, did you get a chance to take a look at the ones i submitted? [15:22:09] pfhayes: no, I'm not notified. [15:22:26] I don't even have admin/push perms. [15:22:31] I do keep a look at the commits though [15:22:43] okay [15:23:42] yeah, we would appreciate it if you or someone else from WMF could sign off on our pull requests before we merge them - just so we don't do anything too crazy :) [15:25:10] pfhayes: I would still leave you guys to the pull requests [15:25:11] BUT [15:25:18] from now on, I'll check the commits every day [15:25:20] and point out craziness [15:25:23] okay [15:25:44] I don't want people blocking on pull req's on us - git is powerful enough to amend things later, so commit early and commit often! [15:25:54] sounds good [15:26:30] hi folks [15:26:46] another question: it turns out that there are almost 0 referrals in the mobile log files, which surprises me. is this correct behavior or should we expect a decent number of referrals? [15:28:23] drdee: heya [15:28:34] referrals = ? [15:28:41] requests with the appropriate header? [15:31:10] The referer header, yes. [15:31:29] yes, the referer header [15:31:48] It seems that it never or almost never is in the log [15:32:36] not sure [15:32:46] it is possible that philinje or preilly know more about that [16:23:13] yuvipanda, I've deployed new MobileFrontend to http://mobile-geo.wmflabs.org/w/index.php?title=Main_Page&useformat=mobile [16:23:21] API spec is at https://www.mediawiki.org/wiki/Extension:MobileFrontend#New [16:27:01] aha [16:27:37] MaxSem: what data is in that, btw? [16:27:46] ??? [16:27:59] MaxSem: what data has been iported into mobile-geo.wmflabs.org? [16:28:09] all of enwiki, a good part, etc? [16:28:14] part of enwiki dump [16:28:24] 1/20thish [16:28:32] good enoug [16:28:32] hoaky [16:28:34] *okay [16:28:50] i'm working on putting out a beta right now [16:28:53] then this and the geo stuff [17:14:40] yuvipanda are you there? Do you have any experience of getting blackberry simulators working on a mac... i'm having lots of issues trying to get them running through virtualbox :( [17:15:44] jdlrobson: :| [17:15:51] jdlrobson: sadly, no :( [17:15:57] jdlrobson: tfinc got them working on his mac though [17:16:03] IIRC he used something called 'Ripple' [17:16:07] I'll have to bug him when he's back then [17:16:21] I was debugging on a wii yesterday. That was not fun. [17:17:17] hehe [17:17:29] jdlrobson: what are you trying out on the blackberry? [17:17:56] I'm just messing around with the MobileFrontend code trying to understand how it differs on different versions. The css for it is very messy and hard to decipher [17:18:22] :D [17:18:36] I figured it would be useful to have an emulator up and running too [17:19:33] jdlrobson: :) are you working on cleaning them up? [17:19:37] btw - was very happy to see how easy it was to slot the geo.js stuff from the android app into the MobileFrontend code I'm experimenting with - https://github.com/jdlrobson/Experiments/compare/betaversion...nearby [17:19:42] that's the plan [17:20:07] preilly should be flying in tonight so hoping to review lots of things with him and hopefully start making lots of commits [17:20:52] jdlrobson: :D [17:21:42] jdlrobson: anything that could be improved in terms of modularity? [17:21:45] i also think MobileFrontend would benefit greatly from being on git... The beta version would lend itself very well to branches [17:22:36] jdlrobson: i'm guessing that'll just have to wait till our svn -> git migration? [17:22:43] jdlrobson: though nothing stops you from using git-svn [17:23:25] yeh i've not used svn in a while so I'm still refamiliarising myself with what and how I use it :) [17:24:01] Maybe I'm DIW but I've attempted to do a git svn clone of the mediawiki codebase and so far it's been running for almost a day :S [17:24:55] jdlrobson: oh that [17:25:05] jdlrobson: took me around 28 hours to complete when I did that :) [17:25:11] that was a long time ago even :) [17:26:05] modularity seems okay. one thing while I remember is that it might be worth being aware that chrome.js uses a variable chrome and apparently Google Chrome already defines that [17:26:36] jdlrobson: https://github.com/mediawiki might save you some sanity with git-svn. or maybe not. [17:27:09] interesting, i've debugged the app in google chrome at times and never hit problems [17:27:52] oh it's fine at the moment [17:28:51] but yeah, will keep that in mind when that bites me [17:28:54] just might cause issues in future [17:30:17] i guess it might be useful in the javascript modules to label their dependencies - for instance geo.js requires leaflet.js, preferences.js, chrome.js and app.js [17:30:26] I had to work that out myself [17:30:47] jdlrobson: yes, that + actual documentation for the individual functions [17:30:55] it also gets asked at all the hackathons [17:45:34] [WikipediaMobile] yuvipanda pushed 2 new commits to master: http://git.io/cHOZTQ [17:45:34] [WikipediaMobile/master] Bumped version to v1.1beta1 - YuviPanda [17:45:34] [WikipediaMobile/master] Bug fixed for onTouch events - Gaurav [17:49:11] philinje, hi [17:49:18] hi [17:49:32] jdlrobson: Jon, u there? [17:52:47] MaxSem: have you seen Yuvi online? [17:53:03] yup, left seconds after you arrived [17:53:57] ok, Jon is ok with a Skype call. Do you want to join? [17:54:08] sure [17:54:58] one sec [18:02:34] [WikipediaMobile] yuvipanda pushed 1 new commit to master: http://git.io/j-QbTg [18:02:34] [WikipediaMobile/master] Merge pull request #140 from nextgensh/master - Yuvi Panda [18:08:51] yuvipanda: hi [18:09:00] hello philinje! [18:09:13] howdy we are on a call - wanna join? [18:09:27] sure [18:09:39] philinje: wait, what call? [18:09:41] the standup? [18:10:05] yes [18:11:19] yuvipanda: hi [18:11:27] shravan: heya [18:11:33] just merged in your code :) [18:11:39] apologies on the delay [18:11:42] yuvipanda: thanks :) [18:11:55] yuvipanda: it is working fine right ? [18:12:09] shravan: mostly, just some layout issues in nearby/history views [18:12:16] with the 'close' button [18:12:44] yuvipanda: ahh. I could not test it completely as my device does not have the required languages [18:12:57] yuvipanda: can you point me to some work ? [18:13:00] shravan: I think that's okay for now [18:13:16] shravan: because we're going to get rid of that piece of UI that's causing problem [18:15:02] yuvipanda: ohh cool. Also thanks for the exposure to phonegap. I am in the process of migrating my apps to phonegap from plain webkit [18:15:14] shravan: :D [18:15:22] shravan: yes, it is fun [18:15:39] yuvipanda: i will catch you in some time. :) Bye for now [18:15:44] shravan: bye [18:20:35] yuvipanda, you need to update your "About me" info in Skype, it currently describes you as a heretic ;D [18:22:24] MaxSem: :D [18:22:26] will do [18:22:53] MaxSem: I don't use skype for anything other than for these [18:32:13] jdlrobson: btw, there's a branch that uses the file API for saved pages [18:32:32] called js-url-cache [18:32:45] and another called js-url-cache-canvas [18:32:51] on the Android app? [18:32:53] neithwr work on android, thoug hi'm hoping they'd work on iOS [18:33:13] yes [18:33:28] PhoneGap provides almost-w3c-compatible implementations of the File API [18:37:08] Which, btw, leads to the next question yuvipanda: midterms [18:37:49] Andre_Engels, if you see a POSTs made by AutoWikiBrowser that lack some information interesting to you in the URL part, just tell me or Reedy and we'll move it from POST [18:38:15] Oh, we have until next Wednesday Yuvipanda. But I'd prefer if we could get together and talk about them/send 'em before Monday. [18:38:24] yuvipanda [18:38:59] Amgine: sure [18:39:19] i've got to rush off now... but on email if you need me! cya! [18:39:19] When works for you? [18:40:26] Amgine: what I'd need to do before that is: 1. Spend some time reviewing all the commits, comment appropriately, 2. Go through logs of previous standups 3. Sit in and talk through on the next standup [18:40:37] and then we could do the mid-terms [18:40:39] sounds good? [18:41:32] Works. Next standup is on Friday at 1800 UTC. [18:41:50] Amgine: let's try to get everyone in on it? [18:42:22] Okay; pfhayes: how is your schedule for Friday? [18:43:51] Amgine: is that 1:00 EST? I am available [18:44:06] yes, and great. [18:52:01] philinje: do you want to wait on a reply from legal before releasing a beta? [18:52:10] tfinc and brion seemed okay with it... [18:52:13] can you poke brion? [18:52:35] also, note that we are NOT using Mapquest's data - just their rendering of OSM data [18:52:41] which is completely different from MapQuest data [18:52:48] i am poking legal right now [18:53:19] we also need to contact Mapquest, but that is less urgent [18:53:29] i will reply to Brion's email, thanks for the heads-up [18:54:34] philinje: so are we blocking releasing the beta? [18:58:35] philinje: ? [19:00:53] philinje: sent you an email [19:01:04] you're good to go with mapquest open tiles :) [19:01:24] just heard from legal - the review will be this afternoon, so yes, let's wait till then [19:01:34] aude: awesome, thanks! [19:03:00] philinje: you are free to contact Roman regarding privacy [19:03:15] thanks [19:03:21] * aude thinks if you've been using google maps, this is one step better [19:03:28] +1 [19:03:32] ++ [19:03:47] exactly, how could anyone complain? [19:04:03] and eventually we render our own and/or use squid as a proxy / caching and so we don't pass private data along to mapquest [19:04:39] philinje: mapquest tiles are on openstreetmap.org [19:04:48] just not the default [19:05:18] ok [19:05:51] you mean map quest tiles are open source or CC licensed? [19:06:09] http://www.openstreetmap.org/?lat=38.8951&lon=-77.0364&zoom=14&layers=Q [19:06:25] philinje: the data is just OSM data [19:06:28] NOT mapquest data [19:06:35] they are CC-By-SA [19:06:43] because the osm data is [19:07:01] * aude not sure how the license will work when osm goes to open database license, though [19:07:08] a legal review of that would be nice [19:07:08] ok [19:07:21] * aude asked mike godwin, and then he left like 3 days later [19:07:26] hehe [19:07:46] just generally, what issues should wikimedia be aware with ODBL [19:07:58] * aude thinks no issues [19:08:11] can you send a little more about that by email? I can run it past Michelle this afternoon [19:08:18] * aude doesn't understand legalese though [19:08:21] philinje: [19:08:22] ok [19:13:32] philinje: http://etherpad.wikimedia.org/android-1-1beta1-release-notes [19:14:13] philinje: sent another email [19:14:43] great thanks [19:16:35] [WikipediaMobile] yuvipanda pushed 1 new commit to master: http://git.io/Ad1MTw [19:16:35] [WikipediaMobile/master] Added items to change log and actually bump version number - YuviPanda [19:16:44] yuvipanda: the release notes are awesome - did you write them? [19:17:10] who is Michelle? [19:17:49] philinje: stolen from tomasz [19:17:57] and updated for beta [19:23:13] so you got articles near this article done? [19:24:32] philinje: that was done in the SF hackathon itself [19:24:34] by jeron [19:24:44] jeroen [19:24:45] yeah that's right [19:24:57] how was Pune? [19:25:46] pretty good! [19:25:56] this beta carries contributions from 3 developers in pune! [19:26:49] awesome [19:28:59] release notes look good [19:29:33] philinje: i'm going to tag and sign the apk and email it to you. Can you poke a few people to test it, and then we can release once legal says 'ok'? [19:30:12] yuvipanda: i am back. Is there some work pending i can get my hands dirty on ? [19:30:27] shravan: how about https://bugzilla.wikimedia.org/show_bug.cgi?id=32903 [19:30:48] yuvipanda: ok [19:30:50] * shravan is checking it out [19:32:23] shravan: pretty simple one, and if you can get it out inside of 30 mins I can sneak that into beta that's going out tonight :) [19:33:02] shravan: there's also this tavestry of non-standard CSS that we'd like to fix https://bugzilla.wikimedia.org/show_bug.cgi?id=32071 [19:35:24] yuvipanda: 2 mins i am connecting my phone and trying to replicate the bug [19:35:56] shravan: okay [19:38:55] yuvipanda: do i need to do a git fetch before making any changing ? [19:39:17] shravan: yes, add the official repo as a remote [19:39:23] and then fetch/pull our master [19:40:39] relocating to somewhere with lesser mosquitoes, brb [19:58:14] can someone help me understand bug #32903 please. The bug says "list of wikipedias", I presume this is the list on the homepage ? [20:08:39] shravan: when we open the preferences for the first time [20:08:50] we load a list of which language wikipedias are available over the internet [20:08:55] and *then* we show the dialog [20:09:03] this has a noticeable delay which is sad [20:09:23] idea is to show the dialog right away, then show some kind of spinner or something while loading [20:09:35] * brion food, biab [20:23:36] hi shravan [20:24:30] I think should be better to load it at the start of the app, so all is ready when the user click on preference.. [20:25:42] Astagi: will that be a waste of bandwidth specially on low end mobile data connections ? [20:27:27] don't think so.. we will load this data only once at the start of the app.. we have to load them anyway :) [20:27:48] Astagi: true :) [20:29:28] :) was just an idea, if you find a better method that's ok :D have a good work fixing that bug shravan ;) [20:32:19] Astagi: :) [20:46:47] Astagi: I plan to create a small function inside the appSettings page called loadLangSettings. Put the ajax code to load the json in there and then call it from chrome.initialize after the Focushack is done. What do you think ? [20:48:25] Astagi: In order that this does not die I will check in appSettings if locales was indeed populated. If not I will force the call to the function again inside it [20:51:13] sounds pretty much sane :) [20:51:18] ok shravan sounds good [20:51:42] brion: ok I will make the changes and test them [20:52:01] Astagi: cool :) [20:56:10] brion do you have an idea when a new version of the app will be released? [20:56:28] i think there's a few more things to fix, sometime in next few weeks tho [20:57:19] ok thanks... just to organize myself to send some fix ;) [21:42:38] Astagi: added that code [21:43:11] Astagi: it is working nicely now. Takes about 60ms more on my 2G connection to load but the settings page springs up instantly :) [21:43:55] :D that's nice shravan! go with a pull request ;) [21:44:46] I can't merge in unfortunately, I have no privilege to do this, will wait for yuvipanda ;) [21:44:59] Astagi: sure I have adding error cases now [21:45:08] Astagi: so it should not faile [21:45:41] ok :) [21:49:12] Astagi: i need a little help with git here [21:49:28] i had cloned the repo some 3 days back [21:49:49] i had forked it on github [21:49:52] ok [21:50:23] so last time when i submitted my pull request my code and the original wikimedia code was sync [21:50:31] yep [21:50:38] but now i think yuvipanda has maded some changes to the main code [21:50:58] ok did you make a branch for the first pull request? [21:50:58] i added the wikimedia as a remote repo using [21:51:09] no i had not [21:51:38] mh ok let's go ahead anyway :) won't interrupt you, sorry :) [21:51:40] huzzah! i return. [21:51:53] so i used git remote add [21:51:58] and added the remote repo [21:52:03] did a git update [21:52:15] ok [21:52:17] what i want to ask is now how do i get my master branch [21:52:27] to the same level as the wikimedia master branch [21:52:32] so i have the latest code ? [21:52:36] welcome back jorm :) [21:53:15] barring any oddities from the bloodwork taken, i am not (apparently) dying any faster than is expected. [21:53:43] you have to do git fetch nameofremote ( for example if it is upstream as in my case you have to type git fetch upstream ) [21:54:20] Astagi: ok will it revert all the modifications i have done now to fix the lang load bug ? [21:54:30] then to merge all the changes type git merge nameofremote/master [21:55:10] no [21:55:12] ok thanks I will do this [21:55:39] may generate some conflict sometime [21:56:00] in general I advice you to not work on master... [21:56:04] create a branch [21:56:12] checkout on that branch [21:56:16] and then work on it [21:56:35] you will do the pull request of that branch [21:56:44] Astagi: ok but now i have already made by changes so I don't think it will allow me to branch without comitting right ? [21:57:06] no you have to commit before branch, sure [21:57:16] you can discard or commit :) [21:57:19] or you can stash [21:57:31] with stash command you can save all your changes [21:57:34] I will commit now :) [21:57:36] then you can branch [21:57:46] Astagi: please go on .. [21:57:58] and load your changes on the current branch [21:59:18] what method you choose shravan? [22:00:06] predator drone delivery. [22:00:12] Astagi: I have stashed [22:00:17] Astagi: made a branch with the bug number [22:00:25] now i will commit to that branch [22:00:34] is what i am doing so far correct ? [22:00:48] * shravan hates it when git records .swp files :( [22:01:00] yes but before commit you have to make the inverse op of stash [22:01:39] stash just save your changes somewhere.. [22:02:20] git stash pop ? [22:02:23] will that work [22:02:48] yep [22:03:08] you pop the last change :) [22:03:23] control if all is ok with git status and git diff [22:03:33] than I advice you to make a new test on the app [22:03:34] superb this is :) i used to always commit my branches before leaving. This new power is cool ... [22:03:35] :) [22:04:18] yeah Marvel should make a new comic on git ;) [22:13:22] Astagi: did that. Tested it on device from branch [22:13:39] Astagi: removed the debug symbols I had added and commited [22:14:14] now I can do a git merge wikimobile-remote/32903 right ? [22:14:16] nice work shravan ;) [22:14:28] ? [22:14:31] were 32903 is my branch and wikimobile-remote is the remote repo ? [22:14:47] no just make git push origin 32903 [22:14:58] and on github will be created the new branch [22:15:10] ok will do that [22:15:12] then go in the new branch on github and open a pull request :) [22:15:34] * shravan wonders why gitorious is not so organized :( [22:15:50] :D [22:17:58] Astagi: submitted the pull request. Thank you for guiding me through this [22:18:39] you're welcome :) lemme have a look.. [22:19:03] yep shravan that's ok ;) [22:19:33] thanks i will retire for the day. Its 3:48 and i have college at 8:30 :( [22:20:26] yep :D have a good night sleep shravan! [22:20:28] cya!