[08:15] <dholbach> good morning
[08:19] <davidcalle> Good morning all
[08:19] <dholbach> salut davidcalle
[08:19] <dholbach> comment ça va?
[08:19] <davidcalle> dholbach, très bien! Et toi?
[08:22] <dholbach> très bien aussi, j'étais déjà pour une course(?) ce matin
[08:24] <dholbach> brb
[08:24] <davidcalle> dholbach, pareil, réveillé à 6h30 par Tristan :)
[08:24] <dholbach> 6:30m - c'est pas mal :)
[08:52] <dholbach> hey beuno, when can we chat about moving the /publish docs into myapps?
[09:10] <dholbach> hey dpm, how's life over there?
[09:12] <dpm> dholbach, good :) check this out: http://people.canonical.com/~dpm/help-app/web/settings.en-us.html
[09:12] <dholbach> NICE
[09:12] <dholbach> good work!
[09:13] <dholbach> hey... so I thought about the attr-lists-and-embedded-html branch again
[09:13] <dholbach> I think the only real chance we have is to define a common markup we want to use for each of the questions and to identify it in a certain way
[09:14] <dholbach> kind of what we do with the "Title: " lines in the .md documents
[09:14] <dholbach> we just assume that they're in the first line of the document
[09:15] <dpm> dholbach, shall we have a call in ~1h to discuss it?
[09:15] <dholbach> sure, wfm
[09:15] <dpm> cool
[09:15] <dholbach> I'll add it to the cal
[09:22] <dholbach> dpm, davidcalle: do you think http://kylenubuntu.blogspot.de/2015/03/aptbrowser-qmlc-app.html is something we could use as an example, maybe on developer.u.c or in lp:ubuntu-sdk-tutorials or something?
[09:26] <Mirv> bzoltan_: so, it seems you found out that qtwebsockets is already available and can be even included on the images?
[09:41] <bzoltan_> Mirv: https://code.launchpad.net/~bzoltan/ubuntu-seeds/add_QtWebSocket/+merge/252303 I have this ready already
[09:52] <dpm> dholbach, in meetings until the next 30 mins, will have a look in more detail then
[09:59] <JamesTait> Good morning all; happy World Plumbing Day! :-D
[10:00] <Mirv> bzoltan_: cool!
[10:26] <dpm> dholbach, I'm done with my call, happy to start earlier if you want
[10:26] <dholbach> sure
[11:11] <dholbach> dpm, mail sent
[11:11] <dpm> dholbach, awesome, replying to the bug now
[11:17] <dholbach> dpm, https://bugs.launchpad.net/help-app/+bug/1430735
[11:32] <mzanetti> DanChapman, ping
[11:34] <DanChapman> mzanetti: hey!
[11:34] <mzanetti> DanChapman, hey, I was just checking the ListItemWithAction from Dekko, and it seems you pimped that a little with haptics feedback and a bar indicating the current one
[11:34] <mzanetti> when triggerActionOnRelease is enabled
[11:35] <mzanetti> DanChapman, mind proposing those tweaks to the upstream component in UCS?
[11:36] <DanChapman> mzanetti: yeah sure thing, i'll try and do that today. :-) while your here how are the reconnects working for you after the update?
[11:37] <dpm> dholbach, actually, rather than opening new bugs, I've added all of the details in comments on bug 1430735 - does that work for you? Happy to file separate bugs too. I've also added a link to that blog post on how to create a pelican plugin
[11:37] <mzanetti> DanChapman, I think it's much better, will watch it for another couple of times and then close the bug as invalid/fix released.
[11:37] <dholbach> thanks dpm
[11:37] <mzanetti> DanChapman, sorry for the noise. I really should have checked if I'm up-to-date before reporting the bugs
[11:39] <DanChapman> mzanetti: excellent! it's still not *perfect* but it's getting there.
[11:40] <mzanetti> DanChapman, It's awesome already
[11:44] <DanChapman> popey: hah i've been pinging you with my random screenshots in #dekko the last few days, didn't even realise you weren't even in there :-D so here you go http://dl.dropbox.com/u/86476930/new-outfit.png
[11:44] <popey> DanChapman: oops.
[11:45] <popey> DanChapman: my vps was restarted, and i clearly missed that channel when restarting my irc session
[11:45] <popey> sorry
[11:45] <popey> oh man!
[11:45] <popey> that looks great!
[11:46] <popey> I feel the urge to read my mail!
[11:48] <mzanetti> DanChapman, where do you get the people's images from?
[11:48] <DanChapman> popey: Hah! yeah i'm quite chuffed with it. I'll send a click your way in a little while. The header is still a little quirky changing states
[11:48] <mzanetti> DanChapman, don't forget to CC me on that mail :P
[11:49] <DanChapman> mzanetti: gravatar atm, not sure if there are any other services like it but would be cool to include them as sources
[11:49] <DanChapman> mzanetti: sure :-)
[11:49]  * mzanetti never heard of gravatar before
[11:58] <dholbach> dpm, your suggestion from yesterday: https://code.launchpad.net/~dholbach/help-app/1430336/+merge/252566 :)
[11:58] <dholbach> and now: lunch time
[11:59] <nik90> popey: Hi, did jibel approve clock app's release? I plan on adding some more AP tests and wanted to do so after the store release.
[11:59] <popey> nik90: no, they're currently testing tvoss' update to location
[12:00] <popey> nik90: well, jibel didn't actually answer my mail yet :)
[12:01] <nik90> popey: ack. I will continue to work on my branch meanwhile.
[12:01] <popey> k
[12:14] <nik90> balloons: ping
[12:25] <newsages> hi
[12:26] <popey> hello
[12:27] <newsages> i try to test mi app, whit c++ plugin and qmake,, but i cant probe on emulator,, QT 5.4... need on emulator,
[14:16] <DS-McGuire> Can someone tell me how I can run a click package in the emulator without uploading it to the store.
[14:19] <batopa> DS-McGuire I have the same question
[14:21] <DS-McGuire> batopa, Any luck at all?
[14:22] <Elleo> DS-McGuire: I haven't done anything much with the emulator myself, but can you SSH into it? if so you can just run "pkcon install-local /path/to/your.click --allow-untrusted"
[14:24] <DS-McGuire> Elleo, Thanks! I am going to try that now :)
[14:24] <batopa> DS-McGuire I haven't no time to try it... maybe opening ssh connection on device and load the package to it
[14:24] <Elleo> DS-McGuire: you're welcome :)
[14:29] <balloons> nik90, pong
[14:29] <dholbach> dpm, http://paste.ubuntu.com/10580323/ :)
[14:32] <balloons> DS-McGuire, you get all updated a-ok with the help app?
[14:34] <DS-McGuire> balloons, Yeah I did thanks! We are in talks now about where to take the design of it :)
[14:35] <DS-McGuire> This is where I got to yesterday: http://i.imgur.com/Q0MGBtl.png
[14:36] <balloons> DS-McGuire, really nice! I love nice design. Thanks so much for helping out. Can't wait to see the result
[14:36] <DS-McGuire> Elleo, I am trying the ssh now, I am getting this back: Fatal error: could not resolve: /home/daniel/help-app/help_0.1_all.click
[14:37] <Elleo> DS-McGuire: are you sure you're using install-local not install?
[14:37] <DS-McGuire> balloons, Not a problem, I am very happy to help. I think that design will change to look more native on the phone judging by recent talks :)
[14:38] <DS-McGuire> Elleo, Very sure. However I am trying to put this onto a Nexus 10 rather than the emulator, does that make a difference.
[14:40] <Elleo> DS-McGuire: should work fine on real devices (I use it on devices)
[14:40] <Elleo> DS-McGuire: is your user really called daniel?
[14:41] <Elleo> DS-McGuire: surely that should be /home/phablet/help-app/help_0.1_all.click
[14:41] <DS-McGuire> http://i.imgur.com/qy50XS3.jpg Elleo,
[14:42] <DS-McGuire> I don't understand why that would be phablet?
[14:42] <Elleo> DS-McGuire: ah, you need to have your click package on the device
[14:42] <Elleo> DS-McGuire: you're pointing it to a local file
[14:42] <Elleo> DS-McGuire: so the click package has to be on the same system you're running pkgcon on
[14:42] <DS-McGuire> Elleo, My apologizes, I think I have confused you haah! Yeah that's my problem, I can't get it on there to start with.
[14:43] <Elleo> DS-McGuire: so just adb push help_0.1_all.click to your device first
[14:43] <Elleo> DS-McGuire: e.g. adb push /home/daniel/help-app/help_0.1_all.click /home/phablet/
[14:44] <Elleo> DS-McGuire: then ssh to the device, and run pkcon install-local /home/phablet/help_0.1_all.click --allow-untrusted
[14:44] <batopa> Elleo thanks I need it too :)
[14:45] <Elleo> no problem :)
[14:46] <DS-McGuire> Elleo, Thank you so much!! All working now! :D :D
[14:47] <Elleo> great :)
[14:54] <dpm> dholbach, yay!
[14:54] <dholbach> dpm, so I can now safely hide and readd whatever statements we have - I'll add tests for it now
[14:55] <dholbach> scratch that, I'll look into the extension first
[14:55] <dholbach> good morning balloons, one for you: https://code.launchpad.net/~dholbach/help-app/1430336/+merge/252566 :)
[14:56] <dholbach> balloons, it adds no new "\" :-P
[14:57] <balloons> dholbach, lol.. I glanced at it earlier. Found it neat you can check for markdown
[15:09] <dpm> hi DS-McGuire, thanks for your contributions to the help app!
[15:11] <nik90> balloons: hey, when I try running adt-run the tests on my phone, it complains that some dependency cannot be found. http://paste.ubuntu.com/10579772/
[15:11] <nik90> balloons: I followed the instructions from your blog post at http://www.theorangenotebook.com/2014/09/autopilot-test-runners.html
[15:11] <dpm> DS-McGuire, and to answer the question about the emulator: it behaves exactly the same as a physical device when it comes to adb
[15:11] <dpm> so you can use 'adb push' to upload a package to it
[15:12] <dpm> and 'adb shell' to log into it and install it locally with pkcon
[15:12] <DS-McGuire> dpm, Not a problem, I will be making more progress soon. And thanks for the tip :)
[15:12] <dpm> or you can use SSH directly as an alternative
[15:12] <dpm> ok, cool :)
[15:12] <popey> nik90: try adding --setup-commands ro-apt-update
[15:12] <popey> nik90: to the adt-run
[15:13] <nik90> popey: ok
[15:13]  * nik90 tries
[15:13] <popey> i ended up having to make my device rw to do an apt-get update
[15:14] <nik90> oh
[15:14] <nik90> popey: btw what's ro-apt-update? it complains that the command is unknown
[15:15] <popey> bah
[15:15] <popey> adt-run -d --setup-commands ro-apt-update --click com.ubuntu.clock --- ssh -s adb
[15:15] <popey> should work
[15:15] <popey> *should*
[15:15] <balloons> nik90, essentially there is an issue with running tests on an out of date image. That is, an image which things older than the current archive
[15:16] <balloons> sometimes that can even cause problems with -proposed the same day it's released
[15:16] <nik90> ah ok..yeah I am trying to run tests on an rtm device
[15:16] <balloons> no solution since we don't ship test libs or depends with the image; you have to be able to grab them from the archive on-demand, but this is not always possible
[15:17] <nik90> hmm, popey's command doesnt work either http://paste.ubuntu.com/10580554/
[15:17] <balloons> nik90, right, so you can do the apt-get update hack popey mentioned, but it's only a workaround. I'd guess it won't work
[15:17] <popey> yeah, i ended up going rw, doing a sudo apt-get update, then make it ro again
[15:17] <nik90> balloons: ok, I will make the device writable and then try the command from your blog?
[15:17] <popey> sudo mount -o rw,remount /
[15:17] <popey> sudo apt-get update
[15:17] <popey> sudo mount -o remount,ro /
[15:17] <popey> that
[15:17] <popey> annoying
[15:18] <balloons> nik90, well more or less the "answer" is you can only test new images that match what's in the archive
[15:18] <balloons> <-- don't shoot, only the messenger
[15:18] <nik90> hehe .. ok
[15:19] <balloons> nik90, is your rtm image up to date? I felt like last time I tried on rtm it did work for me.. I'm probably running rtm-proposed though
[15:20] <nik90> balloons: yup it is..I should be updating to the OTA-2 image next week hopefully
[15:20] <nik90> balloons: nvr mind, doing what popey did worked...make the device writable, run apt-get update, make it ro, and then run adt-run com.ubuntu.clock
[15:21] <balloons> nik90, so apart from adt, you can always go to rw, install or push depends and manually run autopilot directly. But you'll need to get autopilot on the image asap, as if the archive changes, even that won't save you later :-0
[15:22] <nik90> balloons: hmm, but I figured that was the best part of autopkgtest where it would do all that for me
[15:22] <balloons> nik90, I agree and feel the same. the whole, the archive must == image index though sort of ruins it for me
[15:23] <balloons> I *think* the answer may be to build a click containing packages needed for test. I don't have any other ideas
[15:23] <balloons> in essence adt is never an issue as I use it and I'm always running new images.. But for anything else  . . .
[15:24] <nik90> balloons: ok, I will do the autopilot push, install and run tests part myself..I just was hoping for a consistent way of testing. I will try to make a script for myself for this scenario
[15:24] <popey> BOOM!
[15:24] <popey> Yet again, we have a broken test setup, so people write their own scripts.
[15:24] <popey> madness.
[15:25]  * popey gets his coat
[15:26]  * balloons cries a little
[15:28] <balloons> nik90, adt is the consistent way of testing.. The fun I found out with popey recently though that it only works until the archive changes :-(. Which is sad. So modifying the image to r/w and installing your test depends means you can run it even after those packages are gone from the archive. It's put a dent in the magic
[15:28]  * nik90 hugs balloons
[15:28] <balloons> :-)
[15:28] <balloons> We're closer to having an answer... this is simply another wrinkle to iron out eh/
[15:29] <balloons> in other news, I'm writing qml tests today ;p
[15:29] <nik90> ooh that's cool
[15:31] <popey> nik90: in case it's useful, this is my mad script http://paste.ubuntu.com/10580623/
[15:32] <popey> if you set ONEOFF to com.ubuntu.clock and just run it, it should work
[15:32] <popey> also change logdir :)
[15:32]  * ahayzen also has a magical script for running adt/ap on device :) lol
[15:32] <popey> haha
[15:32] <popey> people_who_script_testing++
[15:32] <ahayzen> ..think it is even called magic_script.py or something
[15:32] <nik90> popey: nice, very organized folder creation with timestamps
[15:33] <dholbach> dpm, I'm looking at comment #1 on https://bugs.launchpad.net/help-app/+bug/1430735
[15:33] <dholbach> dpm, maybe you can explain to me which q&a goes into "eight-col" and which into the "four-col last-col" <div>?
[15:34] <dpm> dholbach, sure
[15:34] <dpm> so on the ubuntu web guidelines each row is twelve-col wide
[15:34] <dholbach> dpm, if I understand it correctly we always want to wrap one specific pair of question+answer in one special div, right?
[15:34] <dholbach> ah ok
[15:35]  * dholbach listens and pays attention
[15:35] <dpm> so first of all, each question regardless would be enclosed in a div class="row"
[15:35] <dpm> that's the 12 col width row
[15:36] <dpm> so each question in a row
[15:36] <dpm> inside that row, you can partition columns as you like
[15:36] <dpm> what I was suggesting was for text-only questions to have an eight-col column for the text and an empty four-col next to it
[15:37] <dholbach> sure that WFM
[15:37] <dpm> for questions with images, we could have an eight-col column for the text and a four-col one for the image next to it
[15:37] <dholbach> ok
[15:37] <dholbach> now I get it
[15:37] <dpm> ok, cool
[15:37] <dholbach> so the "four-col" thing is just for an image
[15:37] <dpm> yeah
[15:37] <dholbach> and not for a separate q&a
[15:37] <dpm> exactly
[15:37] <dholbach> right
[15:38] <dholbach> I'll see what I can do
[15:38] <dpm> but yeah, this is something to have some thoughts on. If you think it overcomplicates things, we can perhaps leave it
[15:38] <dholbach> no, that's fine
[15:41] <dholbach> dpm, do you have the markdown markup for http://people.canonical.com/~dpm/help-app/web/settings.en-us.html somewhere?
[15:42] <dholbach> I'm interested in how the entry for an added image looks like
[15:42] <dholbach> looks like it's not in https://code.launchpad.net/~dpm/help-app/test-animated-gif
[15:42] <dpm> dholbach, I think I have a branch, just a sec
[15:42] <dpm> oh, that was the one I tought :)
[15:42]  * dpm looks
[15:42] <dholbach> http://paste.ubuntu.com/10580670/
[15:42] <dholbach> looks like only the image gets added
[15:43] <dpm> ah, yeah, that branch is missing the markup, I just pushed the content to reproduce that bug from yesterday
[15:43]  * dpm pushes markdown
[15:45] <dholbach> go go go!
[15:45]  * dpm needs to reconstruct the branch, which lived in /tmp :)
[15:46] <dholbach> ¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡nooooooooooooooo!!!!!!!!!!!!!!!!!!
[15:47] <dpm> :)
[15:48] <dpm> dholbach, actually, I've tested it and lp:~dpm/help-app/test-animated-gif should have all you need
[15:48] <dpm> it's got the markdown on settings.md
[15:49] <dpm> ah wait
[15:49] <dpm> sorry ignore that
[15:49] <dholbach> https://bazaar.launchpad.net/~dpm/help-app/test-animated-gif/view/head:/edit-here/content/pages/settings.md
[15:50] <dpm> dholbach, try pulling now
[15:51] <dholbach> thanks
[15:51] <dpm> https://bazaar.launchpad.net/~dpm/help-app/test-animated-gif/view/head:/edit-here/content/pages/settings.md#L11
[15:52] <dholbach> yep, found it
[15:52] <dholbach> dpm, so... to implement this, I think it'd make sense to always assume something like ".textonly"
[15:53] <dholbach> as it's likely going to be the primary way how we present questions and answers
[15:53] <dholbach> so for cases where we add a picture, we could add something like ".image"
[15:53] <dholbach> or ".highlight" in case we ever want to do that
[15:54] <dholbach> and add the statement to both question and answer line
[15:54] <dholbach> so the extension knows what to do and what to replace it with
[15:54] <dholbach> does that generally make sense?
[15:55] <dpm> right, yeah. But perhaps we'd need to use some other notation to distinguish it from the python-markdown attribute lists
[15:55] <dpm> what I mean is that we use {: .someclass} to add a class to an element
[15:56] <dholbach> dpm, I was actually thinking of dropping the attr-list extension again
[15:56] <dpm> but with this new extension we'd be wrapping divs around the questions
[15:56] <dholbach> as we don't necessarily use it right now
[15:56] <dpm> dholbach, sounds good to me if we're not using it, yeah
[15:56]  * dholbach nods
[15:56] <dholbach> smile! I'll add this conversation to the bug report
[16:14] <DS-McGuire> dpm, Has anyone thought about how we go "back" in the help app?
[16:15]  * DS-McGuire currently working to make the app not depend on css from a server.
[16:53] <dobey> is there a way to set the qt main window title to something other than what the current Page's title is yet? if not in qml, is it possible to do so when driving the qml from c++ directly?
[17:01] <kalikiana> t1mp: still waiting on a reply from mir folks but fyi https://bugs.launchpad.net/mir/+bug/1425307
[17:01] <kalikiana> this seems to explain the failures in ci
[17:14] <dpm> DS-McGuire, sorry, I was on some calls. Yeah, thought about it, I think it's a critical part we need to figure out. On the web theme, I was thinking of adding breadcrumbs
[17:14] <dpm> which is easy enough when you deal with raw html, but as we're working with markdown for the content, this proves to be a bit more difficult
[17:15] <DS-McGuire> dpm, That is something I was thinking. I have already set it up so when it's on a tablet it adjusts and give it self lots of room for breadcrumbs. However I struggle to think about how we could do this on the phone.
[17:16] <dpm> DS-McGuire, if we use the html toolkit, we could theoretically use the pagestack widget
[17:17] <dpm> but markdown is always the limiting factor, as it's not easy to define html markdown there
[17:17] <dpm> however, on this one perhaps it wouldn't be that difficult to add it to the pelican template code
[17:17] <dpm> it's just that we haven't looked at it yet
[17:18] <DS-McGuire> dpm, That is fine with me, however I have already written a HTML5 app using that and I didn't find its performance very good. If you can confirm it works well on a proper phone I am happy. The app using this is in the store called Golf Score Card if you want to see what I mean.
[17:18] <dpm> oh cool, I haven't tried that yet
[17:18]  * dpm installs
[17:19] <DS-McGuire> dpm, It was only a simple app I wrote to see what I could do in a couple of days.
[17:21] <dpm> DS-McGuire, oh wow, good work in exercising the html5 toolkit! Just tried it now. It works well on the phone, I probably could have not told it was an html5 app if you hadn't mentioned it
[17:22] <DS-McGuire> dpm, Thanks! That means quite a lot :)
[17:22] <dpm> I think I see what you mean about performance
[17:22] <DS-McGuire> Yeah, it is not the best at the moment.
[17:22] <dpm> it takes slightly longer to e.g. switch tabs vs a QML app
[17:23] <DS-McGuire> Without a doubt. I don't want that sort of performance in an app that's quite important to some people.
[17:24] <daker> dpm: screenshot ?
[17:24] <dpm> daker, of Golf Score Card?
[17:24] <daker> yes
[17:24] <dpm> on it
[17:26] <dpm> daker, http://i.imgur.com/KGNhdiJ.png
[17:27] <daker> DS-McGuire: is this HTML5 ?
[17:27] <dobey> shouldn't that be 18/9 holes
[17:27] <dobey> ?
[17:27] <daker> DS-McGuire: well yes from what i can see :)
[17:28] <DS-McGuire> dpm, I didn't even know it did that! haha
[17:28] <DS-McGuire> Oh, and I do see that mistake :L :L
[17:29] <dpm> :-)
[17:29]  * DS-McGuire loads sdk
[17:29] <dpm> daker, it is
[17:30] <DS-McGuire> dpm, The performance issue I was talking about was when you would swipe across through the pages.
[17:30] <dpm> DS-McGuire, ah, there seems to be no swipe anymore with the new header
[17:31] <daker> yes, we have switched to the new header
[17:31] <dpm> good work daker, btw, I did hear we finally landed it!
[17:31]  * dobey wonders about page title vs window title though
[17:31] <DS-McGuire> dpm, Well that's good then. But is there still performance problems? I haven't got an Ubuntu Device so I can't really tell.
[17:31] <DS-McGuire> yes daker It is much nicer :)
[17:32] <dpm> DS-McGuire, I think I wouldn't call them problems. I notice that it takes _slightly_ more to switch to pages than a native app
[17:32] <dpm> but that's probably because I was explicitly looking for a performance issue :)
[17:32] <DS-McGuire> dpm, That's fine then. If you are happy with that performance then I have no problem doing it :)
[17:32] <dpm> I think in this case it's acceptable
[17:32] <dpm> yeah
[17:34] <DS-McGuire> dpm, I will look at it later today :)
[17:34] <dpm> awesome :)
[17:47] <DS-McGuire> dpm, Is something like this okay? http://i.imgur.com/xzUDQl1.png
[17:53] <dpm> DS-McGuire, that looks way better now, yeah :) As a comment, I'd say that perhaps the 3 <li> should probably not look as an action that can be tapped
[17:53] <dpm> bbiab, grabbing something to it
[17:53] <DS-McGuire> dpm, oh, I was planning on making an action that took them to that relevant thing.
[18:04] <dpm> DS-McGuire, yeah, that'd make sense for links, but those 3 are just list items without a link
[18:04] <DS-McGuire> dpm, Do you want them to be or not? I don't mind :P
[18:05] <dpm> DS-McGuire, I think I'd leave them as they are (i.e. not links), as it might be confusing to have both them and the buttons below
[18:06] <DS-McGuire> dpm, Okay :)
[18:06] <dpm> cool, thanks!
[18:11] <dobey> links in apps is confusing, yes
[18:30] <popey> ogra_: what was the max capacity microsd card you said you had in your krillin?
[18:33] <rickspencer3> mhall119, fyi ... lately, I think my tablet might as well be called the UReddit 7 instead of Nexus 7
[18:49] <jgm90> hello guys
[18:50] <ahoneybun> hey jgm90
[18:50] <jgm90> i want to create an app for ubuntu touch
[18:50] <jgm90> i need download a file from url is there any example like that
[18:51] <jgm90> and sry for my english :D
[18:51] <ahoneybun> so you need to use wget jgm90?
[19:33] <DS-McGuire> Can someone give me a hand pushing the code for the help app to LP? I want to rest!
[19:35] <DS-McGuire> balloons, Sorry to be a pain^
[19:36] <balloons> DS-McGuire, what;s your branch?
[19:37] <DS-McGuire> I got the code using: bzr branch lp:help-app and according to LP  I can push the branch directly to Launchpad with the command:
[19:37] <DS-McGuire> bzr push lp:~daniel-mcguire351/help-app/help-app BUt I am not sure what that means.
[19:38] <DS-McGuire> I don't think I have a branch.
[19:39] <dobey> it means you run that command and it will put your changes in that location on launchpad, assuming you've committed your changes
[19:40] <dobey> the last "help-app" in that url is just the branch nick, so if you want to name it "fix-something" instead, you can push to lp:~daniel-mcguire351/help-app/fix-something instead and it will be there (or just rename the local directory from help-app to fix-something first, then push)
[19:40] <DS-McGuire> dobey, I have made changes yes. And when I run that command I get : bzr: ERROR: Not a branch: "/home/daniel/".
[19:41] <dobey> DS-McGuire: you need to do it inside the branch tree
[19:41] <dobey> your home directory isn't a branch, which is what that error means (you're not in the branch)
[19:41] <DS-McGuire> dobey, right... So what is the branch?
[19:42] <dobey> DS-McGuire: where did you make the changes?
[19:42] <DS-McGuire> dobey, Do you mean in the code?
[19:42] <dobey> DS-McGuire: the directory created as a result of "bzr branch lp:foo" is the branch
[19:42] <dobey> DS-McGuire: go into that directory and do the bzr push
[19:44] <DS-McGuire> dobey, Done. Thank you so much! I literally am exhausted. You are a life saver :)
[19:44] <balloons> DS-McGuire, awesome :-)
[19:45] <balloons> sorry, I stepped away a sec
[19:45] <DS-McGuire> balloons, Not a a problem. dobey was here to rescue my ass :)
[19:46] <balloons> DS-McGuire, so I see your code now: https://code.launchpad.net/~daniel-mcguire351/help-app/help-app
[19:46] <DS-McGuire> balloons, That's it!
[19:46] <balloons> you can propose it for merging and we'll review
[19:46] <DS-McGuire> I will do that now ;)
[19:47] <balloons> DS-McGuire, ohh, there is one thing though
[19:47] <balloons> DS-McGuire, you didn't commit your changes locally
[19:48] <balloons> Do you see on that page how the recent revisions shows Daniel and David, but nothing from you?
[19:48] <DS-McGuire> balloons, yeah...
[19:48] <balloons> DS-McGuire, so this is simple to solve. From the directory, type 'bzr commit'
[19:49] <balloons> this will commit your local work to the bzr repo. Then you can issue the push command again and it will appear in launchpad
[19:50] <DS-McGuire> balloons, When I type bzr commit I open nano...
[19:51] <balloons> DS-McGuire, right. Add a small statement about what you did, then save and close nano
[19:52] <balloons> ctrl+o and enter will do the second piece of saving and closing
[19:53] <DS-McGuire> right...
[19:53] <DS-McGuire> I will commit now
[19:54] <DS-McGuire> "Pushed up to revision 91."
[19:55] <DS-McGuire> balloons, Pretty sure that is all done now, thanks a lot :)
[19:59] <balloons> DS-McGuire, can you see what bzr status says?
[19:59] <balloons> whenever you add or remove files from the branch you have to use commands to let bzr know about it. I'm guessing you added some files that aren't showing up
[20:00] <DS-McGuire> I think I may have added a few images, yes. I don't know where to look for the bzr status.
[20:05] <dobey> DS-McGuire: run "bzr status" :)
[20:05] <dobey> DS-McGuire: when you commit, it also lists unconmitted files in a comment in the editor so you can see if you missed any
[20:06] <dobey> you need to "bzr add" new files before committing, so they will be included, though
[20:07] <DS-McGuire> dobey, When I run "bzr status" I get unknown:  app/pictogram-quote-orange-hex.svg
[20:07] <DS-McGuire> I assume i missed that then.
[20:08] <DS-McGuire> Just added it and commited it.
[20:08] <dobey> yes, that means it hasn't been added
[20:08] <DS-McGuire> onto revision 92 now :P
[20:13] <DS-McGuire> Thanks guys for you help, I hope that is all correct :)
[20:13] <balloons> DS-McGuire, you are welcome
[20:13] <balloons> so looking at your mp, there's another little issue (always something eh?). See the 'Text conflict ' line?
[20:13] <DS-McGuire> I have saved all the commands haha!
[20:14] <DS-McGuire> balloons, I do yes
[20:17] <balloons> DS-McGuire, that means your branch is out of sync with trunk
[20:17] <balloons> DS-McGuire, so you need to re-merge trunk
[20:17] <balloons> bzr merge lp:help-app
[20:18] <DS-McGuire> 1 conflicts encountered.
[20:21] <DS-McGuire> I assume that isn't good.
[20:24] <DS-McGuire> balloons, What is the next best step?
[20:27] <balloons> DS-McGuire, what does the conflict say?
[20:27] <balloons> DS-McGuire, to avoid this, use bzr pull to keep your local branch up to date before making changes. I know the help-app has been moving fast, so that's likely the reason it happened ;-0
[20:27] <DS-McGuire> Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.1.
[20:27] <DS-McGuire>  M  edit-here/po/de.po
[20:27] <DS-McGuire>  M  edit-here/po/es.po
[20:27] <DS-McGuire>  M  edit-here/po/fr.po
[20:27] <DS-McGuire>  M  edit-here/po/it.po
[20:27] <DS-McGuire>  M  edit-here/po/pt.po
[20:27] <DS-McGuire>  M  edit-here/po/ro.po
[20:27] <DS-McGuire> Text conflict in edit-here/po/de.po
[20:27] <balloons> DS-McGuire, did you intend to change that file?
[20:28] <balloons> edit-here/po/de.po I mean
[20:28] <DS-McGuire> balloons, I see. But wont that overwrite what I do?
[20:28] <DS-McGuire> balloons, No I didn't. I never touched that app.
[20:29] <DS-McGuire> app=file^
[20:30] <balloons> DS-McGuire, ok, so you can manually fix it then. Go into the file and edit it
[20:30] <balloons> make it like so: http://paste.ubuntu.com/10582075/
[20:31] <dobey> does help-app have automatically updated po files?
[20:31] <balloons> looks like a lp generate thing yes dobey
[20:31] <balloons> easier ways to tell him to solve it
[20:31] <balloons> ?
[20:31] <dobey> i meant when you run 'make' for example
[20:32] <dobey> if they don't get built locally and only get updated from lp imports then it shouldn't be a problem
[20:32] <DS-McGuire> with the updating of that file do I only change lines 28-30?
[20:32] <dobey> just edit the file and fix whatever happened to have changed in your own branch so that the change isn't there and the version in trunk is what's in your tree
[20:33] <dobey> such that ideally "bzr diff --old lp:help-app" does not include any changes to that file
[20:40] <DS-McGuire> I did update the file however I still have text conflicts.
[20:42] <DS-McGuire> dobey, It looks like all the po files get updated automatically:
[20:42] <DS-McGuire> daniel@Otacon-Desktop:~/help-app$ bzr status
[20:42] <DS-McGuire> modified:
[20:42] <DS-McGuire>   edit-here/po/de.po
[20:42] <DS-McGuire>   edit-here/po/es.po
[20:42] <DS-McGuire>   edit-here/po/fr.po
[20:42] <DS-McGuire>   edit-here/po/it.po
[20:42] <DS-McGuire>   edit-here/po/pt.po
[20:42] <DS-McGuire>   edit-here/po/ro.po
[20:42] <DS-McGuire> unknown:
[20:42] <DS-McGuire>   edit-here/po/de.po.BASE
[20:42] <DS-McGuire>   edit-here/po/de.po.OTHER
[20:42] <DS-McGuire>   edit-here/po/de.po.THIS
[20:42] <DS-McGuire> conflicts:
[20:42] <DS-McGuire>   Text conflict in edit-here/po/de.po
[20:43] <balloons> DS-McGuire, yes if you edit it the way I showed in the paste (remove the other lines completely), you should be fine
[20:46] <DS-McGuire> balloons, I am so sorry about all this, but mine isn't even like that: http://paste.ubuntu.com/10582138/
[20:47] <balloons> DS-McGuire, ohh it's worse now, heh
[20:47] <DS-McGuire> haha!
[20:48] <balloons> DS-McGuire, ok, so the idea is to remove everything between [20:48] <balloons> finally then remove any <<<<<<< TREE lines
[20:51] <DS-McGuire> http://paste.ubuntu.com/10582169/
[20:51] <DS-McGuire> balloons,
[20:51] <balloons> DS-McGuire, then tell bzr to resolve it
[20:51] <balloons> bzr resolve --all
[20:52] <DS-McGuire> balloons, ...
[20:52] <DS-McGuire> 0 conflicts resolved, 0 remaining
[20:52] <DS-McGuire> YAY!
[20:53] <DS-McGuire> If I ever meet you I am buying you a drink...
[20:53] <dobey> yeah conflicted files have conflict markers
[20:53] <DS-McGuire> dobey, So is it all good?
[20:54] <dobey> weird that the headers got changed around like that though
[20:54] <dobey> DS-McGuire: "bzr diff --old lp:help-app"
[20:54] <dobey> DS-McGuire: if that command shows no changes in that file, then you're good
[20:54] <balloons> DS-McGuire, yes more or less simply commit then and push again
[20:54] <dobey> i suspect it'll show you've added an empty line though
[20:56] <DS-McGuire> pushing now :)
[20:57] <DS-McGuire> done balloons and dobey thank you so much guys! :D
[20:58] <balloons> DS-McGuire, you had to learn quite a bit to get that proposed, heh
[20:59] <DS-McGuire> balloons, I literally haven't learnt so much in all my life hahah!
[20:59] <balloons> so DS-McGuire now that everything is "correct" on the mp, the only change I see is you added an image. I presume there are more changes
[20:59] <balloons> so heh, we should solve that
[20:59] <DS-McGuire> I didn't add any more files, just modified them. balloons
[21:01] <balloons> DS-McGuire, I assume you did. The trouble is, we don't see any modifications. Did you make the modifications in the same directory as what you commited?
[21:02] <DS-McGuire> balloons, Jesus. It doesn't have the www folder inside app
[21:06] <DS-McGuire> balloons, If you want the code it's here: https://www.dropbox.com/s/guftavrydtlbk5c/help-app.zip?dl=0 I can't do anymore tonight. I have been awake for 14 hours already. I am sorry for messing most of this up, thanks for you help
[21:26] <t1mp> kalikiana: https://bugs.launchpad.net/mir/+bug/1425307 is fix released now
[22:28] <kalikiana> t1mp: wow that was fast then, looking forward to ci re-running
[23:10] <batopa> which qml components needs to display drawer?