/srv/irclogs.ubuntu.com/2016/03/15/#ubuntu-unity.txt

mterrymzanetti: for tomorrow, with cjwatson's help, I fixed the ppa issue00:06
Mirvmterry: they seemingly weren't there anymore, the 8.13 packages. so I deleted the published and superseded packages, plus removed unity8 from train data too temporarily05:32
=== maclin1 is now known as maclin
pstolowskimzanetti, hey, i missed your message yesterday evening08:34
pstolowskimzanetti, the fix for filters i talked about is not critical and it's for Music scope. i'm working on it in my other silo, when ready and it's not too late i'll add it to silo 41; if not, i'll land a bugfix asap separately08:35
mzanettitsdgeos, hey, not gonna block on this, but I guess this needs addressing in upcoming branches:09:27
mzanettitsdgeos, set your phone to german language:09:27
mzanettithen go to the dash, enter search and select "Entwicklungswerkzeuge" (developer tools that is)09:27
mzanettinow type something09:27
mzanettithe deparment thing in the textfield takes all the space, it is not possible to see what you type, nor a way to scroll09:28
tsdgeosmzanetti: right, that's going to need input from UX on how they want that fixed09:32
tsdgeosmzanetti:  could you send paty_ a screenshot? want me to?09:32
mzanettiack09:32
pstolowskimzanetti, hey, i'm going to add fix for music scope to silo 4111:58
mzanettiok then...11:59
pstolowskimzanetti, what about the OSK issue11:59
pstolowski?11:59
mzanetticurrently I'm doing a unity8 rebuild... but I plan to close the door after that rebuild if it turns out to be good11:59
mzanettiOSK issue fixed11:59
mzanettifound another one by now, fix in the build queue tho11:59
mzanettipstolowski, ^12:00
pstolowskimzanetti, ack. if I start build of just music scope in the silo, will it interrupt your build or something?12:02
mterrytsdgeos: re: listitemworkaround...  I did follow the instructions (press and hold an item, then drag) in the bug.  But maybe I was doing them in the wrong place?  I started a search in the dash, then did it on the category items.  Is there somewhere else that's affected?12:41
tsdgeoswhat are "category items" for you?12:41
tsdgeosmterry: this is what we're talking about12:42
tsdgeoshttp://imgur.com/BOGFJ2G12:42
tsdgeosapp scope or store scope for example12:43
tsdgeosfood!12:43
mterrytsdgeos: yeah exactly.  The "departments" is what I meant12:44
mterrytsdgeos: those didn't exhibit the bug when I commented out your patch from silo 41.  I'll reflash and try again now that the silo is presumably sane.  Maybe I built something wrong12:45
mterrytsdgeos: (you wouldn't call those categories?)12:45
=== alan_g is now known as alan_g|lunch
mterrymzanetti: the silo still doesn't install well from citrain I notice (tries to uninstall parts of unity8).  Is that a known issue?13:16
mzanettimterry no13:18
mzanettiwas working for me13:18
tsdgeosmterry: the problem is that categories in scopes are each of the blocks of a scope13:19
mterrymzanetti: regarding xenial FF and silo 41.  The geonames expose-more branch adds API.  So would break FF.  And it's in main.  So it's not covered by the blanket xenial FFe for touch, right?  (that's for universe?)  Maaaaybe it's covered by silo 41's FFe, but that was for OTA 10, not xenial, right?13:26
mzanettiI've no clue13:27
seb128mterry, you should probably ask for the FFe, I'm sure it's an easy one to get13:27
mzanettiltinkl, can we change the string "about this device" only for Mir based environments?13:27
mzanettiseb128, we have a FFE, saviq asked for it13:28
mzanettihowever he is out this week and I don't have details13:28
mterrymzanetti: but thats' for OTA 10, right?13:28
mzanettidunno13:28
seb128mterry, well ffe are ubuntu process no? if you got one you can land to xenial...13:28
mterryseb128: yeah I'll look at it13:30
ltinklmzanetti, why you want to change the string only for u8?13:30
seb128mterry, you can probably nag Laney to get it review/approved if you need to13:30
mzanettiltinkl, I don't but seb wants to *not* change it for unity713:31
seb128ltinkl, I think it's going to confuse desktop users on the traditional unity713:31
mzanettivarious reasons... one is a string freeze, the other is he doesn't like it13:31
ltinklmzanetti, seb128: sure I can but that's not what the design wanted13:31
mzanettiseb128, you gotta think more convergence :)13:31
seb128ltinkl, well, then you need a UIFe bug with a design comment saying it's right for unity7/Xenial13:31
mzanettibut yeah, the string freeze thing is a good reason13:32
ltinklagreed13:32
seb128I also think we are going get to traditional users comment on "wth, now my desktop tower is a device"13:32
seb128I don't see much point going through those arguments for unity713:33
seb128it's fine to do for unity8 though13:33
seb128well, just my opinion13:33
mzanettiseb128, thing is, we have 1 code base13:33
ltinklseb128, not that I disagree...13:33
seb128as said if you have a UIFe with a comment from design it's fine to change13:33
mzanettiand well... everything is a "device"13:33
seb128mzanetti, right, but the same diff has13:33
seb128+13:33
seb128+  if (g_getenv ("MIR_SOCKET") != NULL) // only under unity813:33
seb128+  {13:33
ltinklseb128, mzanetti: I'll revert the "about" string change and we can adjust it later, agree?13:34
seb128ltinkl, or put it under ^13:34
ltinklseb128, yeah, I'll do it only for u813:34
mzanettiltinkl, no... having "about this computer" on a phone is definitely even more wrong13:35
mzanettibut yeah... if/else for unity8/unity7 works for me13:35
ltinklmzanetti, yup, I said for u813:35
mzanettikk13:35
seb128thanks13:37
ltinklseb128, mzanetti: quick "review": https://pastebin.kde.org/pm7rviobx13:39
seb128+113:39
tsdgeosmterry: still no able to reproduce?13:41
mzanettidednick, how's it going with the side stage stuff?13:46
dednickmzanetti: working on it. just managed to get u8 built.13:46
dednickfrom silo13:46
dednickcan confirm it's not working in tryTabletStage13:47
=== alan_g|lunch is now known as alan_g
mterrytsdgeos: sorry, ran into another issue elsewhere, haven't tested13:59
dednickmzanetti: think i've found it. spreadView14:16
dednickspreadView.sideStageWidth was moved to the stage root.14:16
dednickbut it's used out of context in the transformed delegate.14:16
mzanettidednick, nice. let me know when you pushed it so I can rebuild14:17
mterrymzanetti: do you know when we start forking xenial for landings?  we did that for wily, right?14:32
mzanettimterry, I think we will, yes14:33
mzanettiI just talked to Saviq, he didn't know we're in xenial FF (I didn't either)14:33
mzanettibut yeah, this will become an issue soon, at lastest when we open the phone-overlay for OTA-11 features again14:33
mzanettiso I expect after OTA-10 we'll get a stable-phone-overlay ppa for xenial too14:34
=== charles_ is now known as charles
tsdgeosor ignore and carry on ! :D14:47
tsdgeosif we're not going to have a phone based on xenail (big if) what's the point of having a stable-phone-overlay for it14:48
mzanettitsdgeos, to be able to continue landings without being affected by teh xenial feature freeze14:49
tsdgeosah14:49
tsdgeosyou mean why there's no yo yoyo14:49
tsdgeoss/why/while14:50
mzanettiyep14:50
mzanettiyo yoyo is not the final name, is it?14:50
mzanetti(one never knows)14:50
sil2100Well, we already have xenial overlay-ppa support14:51
sil2100Our devel-proposed images build with stable-phone-overlay enabled, the same as for vivid14:52
sil2100We had some packages that we needed 'locking down' and not pulling in from the xenial archives14:52
sil2100pkcon and click IIRC14:52
mterrysil2100: but it's not turned on by default for xenial landings, right?14:56
sil2100mterry: no, not yet14:56
ltinklmterry, sil2100: while I have you here, can we change the seed to install "indicator-session" on $devices with OTA 10?14:57
mzanettiltinkl, we need ot land silo 41 first14:57
mzanettisil2100, ^14:57
sil2100ltinkl: hm, sure14:57
ltinklsil2100, yeah, ideally with silo 4114:58
sil2100Ok, I'll add it to the seed once that happens14:58
mterryltinkl: I thought we fixed that by the recommends?14:58
sil2100I'll have to confirm with Pat as always :)14:58
mterrysil2100: hold up, we added a recommends for it14:58
ltinklmterry, oh right... does it install the recommends automatically?14:58
mterryltinkl: yes14:58
mzanettiit doesn't with the citrain tool at least14:58
ltinklok then, sorry for the noise14:58
mzanettinot sure if the image bootstrap thing would do14:58
* ltinkl still a newb wrt debian stuff14:58
mzanettiltinkl, well, fwiw, debian does not auto-install recommends, ubuntu does14:59
mterrymzanetti: it should, that's how we always make ubuntu images...14:59
mterrywe have other recommends that get installed, like the scope stuff14:59
sil2100I think it should pull it in14:59
ltinklI see14:59
mzanettikk then, all good I think14:59
sil2100Let's see once it lands and we can react accordingly14:59
mterrymzanetti: interesting that citrain doesn't14:59
mzanettiyeah15:00
mzanettiit probably should in that case15:00
sil2100btw. FF is this Friday, right?15:00
ltinklbug bug bug, it should behave the same right?15:00
mzanettisil2100, last friday, but silo 41 has an exception15:00
sil2100I mean, xenial FF ;)15:00
mzanettiah ok15:00
mzanettidunno15:00
sil2100Ah, yeah, we're in FF already15:01
sil2100nvm me15:01
ltinklmzanetti, pushed an update to indicator-session15:02
mzanettiagain? :D15:02
ltinklmzanetti, mterry wanted me to :) http://bazaar.launchpad.net/~lukas-kde/indicator-session/desktopModeSwitch/revision/47715:02
* ltinkl looks innocent15:02
mterrymzanetti: this is a good one!  prevents us from having to MIR unity815:02
mzanettimterry, can you review the diff please15:04
mzanettilooks ok to me, but then all the g_stuff15:04
mterrymzanetti: ?  that's my diff15:04
mzanettioh is it15:04
mterrymzanetti: I can review it too...  :)15:05
mzanettiyeah man. also please release it, I'm going for a break :D15:06
mzanettij/k, checking it out atm15:06
mzanettican't build the silo atm15:07
ltinklmzanetti, lp down for me15:07
mterrymzanetti: btw, I filed bug 1557557 as an FFe15:11
ubot5bug 1557557 in indicator-session (Ubuntu) "[FFe] geonames & indicator-session (silo 41)" [Undecided,New] https://launchpad.net/bugs/155755715:11
mzanettimterry, what's happening with this now?15:17
mterrymzanetti: with the FFe?  I poked Laney.  We wait for someone in ~ubuntu-release to approve15:18
mzanettiah ok15:18
mterrymzanetti: in better-windowed-logic, when we reboot, I assume the state gets reset by onPointerInputDevicesChanged on startup?15:19
mterrymzanetti: in which case, we don't really need gsettings at all?  Except as a way to communicate with the indicator15:19
mterrymzanetti: which we usually use dbus for15:19
mzanettimterry, yeah... atm it's mostly just for communication15:20
mzanettimterry, I figure we might come up with something more minimalistic15:21
greybackmzanetti: hey, I need to run, will miss the standup15:21
mzanettimterry, but then I'm really not sure if design doesn't chagne their mind again and wants it to persist eventually15:21
mterrymzanetti: fair...15:21
mzanettimterry, all those decisions seemed very ad-hoc to me and not properly thought through if you ask me15:21
mzanettimainly they came up with something that works for the M10 for MWC and then told me to land it as is15:22
mterrymzanetti: we'll land it and they'll revise15:22
mzanettimterry, that was my thought...15:24
mzanettimterry, same for the 50gu limit etc15:24
mterrymzanetti: I don't like silo 41 squeezing into ota1015:24
mzanettimterry, we have to15:24
mterrymzanetti: I understand that.  I just think it's ill advised15:25
mzanettimterry, we *really* need the new side stage for the M1015:25
mzanettimterry, also the new OOBE for turbo (I'm still very sad we missed the frieza factory image for that)15:25
=== dandrader_ is now known as dandrader|lunch
mterrymzanetti: pushed dednick's patch to tutorial-redesign15:48
mzanettikk15:52
* mzanetti rebuilds15:52
mterrymzanetti: another thing with better-windowed-logic.  It doesn't seem to factor in changes in screen size.  That is, let's say I have one mouse attached to my phone.  Then dock my phone.  I don't think this code would pick it up15:53
mzanettiwhy not?15:53
mterryIt wouldn't trigger on root.width changing (that I can see), and it doesn't save oldScreenSize like it saves oldPointerCount15:53
mterrymzanetti: ^15:53
mzanettimterry, well, so far, pluggin an external screen equals plugging a mouse (virtualtouchpad)15:54
mterrymzanetti: an external touch screen, maybe15:54
mzanettimterry, no15:55
mterrymzanetti: really, any?15:55
mzanettiyou plug an external screen, the internal morphes to a touchpad15:55
mzanetti=> that adds a mouse on kernel level15:55
mterrymzanetti: what the heck.  So touchPadModel.count would get updated?  (or miceModel?)15:55
mzanettiyes15:55
mzanettimterry, that's what it has been so far all along15:55
mterrymzanetti: is that behavior we can rely on going forward, or is that just some mwc hack?15:55
mzanettiwell, it's like this already since earlier15:56
mzanettimterry, I agree we need to change that eventually, at lastest when the virtualkeybarod is not always on any more15:56
mzanettibut again, I'd like to have design properly think it through before coming up with more new stuff15:56
mterrymzanetti: oh....  you mean not that we treat the new screen as a touchpad, but that the phone morphs into a touchpad15:56
mzanettiyes15:58
mterrymzanetti: ok...  so fine.  I plug my phone into a tiny (<90gu) screen.  Then add a second monitor that's bigger.  In that case, we wouldn't re-evalutate.  I know that can't happen now, I'm just saying.  This code doesn't re-evaluate at the right times, afaict15:58
mterrymzanetti: but maybe that's fine for ota1015:58
mzanettiyes you're right15:58
mterrymzanetti: maybe just add a FIXME?15:58
mterrymzanetti: but the MP seems fine besides.  I don't have a tablet to test on, but this branch appears to be well-tested15:59
mzanettimterry, yes, this has been tested on MWC devices15:59
mzanettimterry, I just kicked a rebuild before this conversation... do you really want me to add the FIXME comment? to me it's quite obvious that this needs to evolve into *much* more than what it curretnly is16:03
mterrymzanetti: fine16:03
mterrymzanetti: you really think that'll be the last rebuild?  :)16:04
mterrymzanetti: tutorial-redesign has never yet had a proper review, I don't think16:04
mterrydednick: were you reviewing tutorial-redesign, is that why you had the patch for me?16:05
mterryltinkl, mzanetti: now that indicator-session doesn't depend on unity8-schemas anymore...  we could probably drop the unity8-schemas package again.  But maybe it will be useful in future, so it doesn't hurt.  Just a little annoying for installing on command line16:18
ltinklmterry, why annoying on cmd line?16:19
mterryltinkl: one more package to "dpkg -i" (along with the standard 3 of unity8, unity8-common, and unity8-private)16:19
ltinklmterry, yeah but how many times you do that? or users16:20
mterryltinkl: *I* do it a lot, when building locally16:20
mterryltinkl: what's with the autopilot and qmltest failure in sessionIndicatorForDevices?16:21
mterryautopilot one was indicator-related, so it might be due to your MP16:22
mterryI didn't know why the qmltest failure would happen though16:22
* ltinkl looks16:22
ltinklmterry, the qmltest failure seems Dash related?16:24
ltinklmterry, as for the AP failure, I see this error there: 13:32:28.623 ERROR content:48 - Could not add content object 'None' due to IO Error: [Errno 2] No such file or directory: '/var/log/syslog'16:25
mterryltinkl: sure, but I'm not sure that's related to the test failure...16:26
mzanettidednick, mterry: https://ci-train.ubuntu.com/job/ubuntu-landing-041-1-build/71/console16:29
mzanettithere's a conflict16:29
mterryfor the love of...16:30
dednick:)16:30
mterrydednick: looks like you added appId and isDash?16:31
dednickmterry: um, maybe. but i think they already exist.16:32
dednicki might have moved them16:32
dednickor someone did16:32
mterrydednick: your patch you gave me dropped isDash16:32
mzanettinot the isDash. that has been there16:33
dednickmterry: it was a duplicate.16:33
mzanettiin dednicks branch it was there twice16:33
mterry...  not that I can see16:33
mzanettiI dropped one occurance16:33
mterryah hm16:33
mterryi hadn't merged when I applied, that's probably the issue.  OK16:33
mterrymzanetti, dednick: pushed16:34
mzanettitsdgeos, hey, I seem to be getting test failures on the silo16:37
mzanettihttps://unity8-jenkins.ubuntu.com/job/test-ppa-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/lastBuild/16:37
tsdgeosmzanetti: something is very wrong16:39
tsdgeoshttps://unity8-jenkins.ubuntu.com/job/test-ppa-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/lastBuild/testReport/junit/%28root%29/qmltestrunner/tst_TabletStage__compile/16:39
mzanettitsdgeos, yes, that's known, we're fixing16:39
mzanettitsdgeos, but think that should affect the DashContent ones?16:40
tsdgeosmzanetti: seems unlikely, let me see16:41
mterryltinkl: is "zh" a valid keyboard layout?  I think I got a crash when setting that  manually on command line (see my latest comment in MP)16:42
mterryltinkl: (crashed when I tried to switch to it, not when setting via gdbus)16:42
ltinklmterry, crash in mir?16:43
ltinklmterry, can you get a BT?16:43
mterryltinkl: I can work on that, but can you confirm?16:43
ltinklmterry, looking up16:43
ltinkla sec16:43
mterryltinkl: I don't know what crashed, u8 just stopped responding, I assumed it was apport work16:43
ltinklmterry, "zh" isn't valid16:44
ltinklmterry, see /usr/share/X11/xkb/symbols16:44
mterryltinkl: ah, should have used 'cn'16:45
ltinklmterry, but setting the keymaps to arbitrary values isn't really a valid usecase either16:45
mterryltinkl: ok, so crash isn't blocker, but we probably shouldn't be so brittle16:45
ltinklmterry, yea, it shouldn't crash (and I bet it does in Mir)16:45
mterryltinkl: yeah, but we shouldn't crash either  :)   not blocker for now though16:45
ltinklmterry, you can try testing with "jp+dvorak" ;) good luck getting your keyboard back16:47
mterryltinkl: yes, crash in libmirclient16:47
ltinklmterry, I remember anpok adding a crash guard exactly for this case (of invalid layouts)16:49
mterryltinkl: bug 155763416:49
ubot5bug 1557634 in mir (Ubuntu) "Crashes when given an invalid keymap" [Undecided,New] https://launchpad.net/bugs/155763416:49
mterryltinkl: my usual is "fr" and I see what the 4 button does  :)16:50
ltinklmterry, yeah, that's a safe testcase (azerty vs qwerty)16:51
mterryltinkl: keymapSwitching was infected with tags!  I cleaned them, but be careful if you push to it again16:52
ltinklmterry, uh thx, pretty sure I cleaned them up but I noticed trunk had them too16:53
ltinklmterry, wonder if we could remedy that by having some sort of "pre push hooks"16:54
ltinklmterry, that would strip them16:54
mterryltinkl: oh, did you ever get a chance to look at https://code.launchpad.net/~mterry/phablet-tools/tutorial-redesign/+merge/277764 ?16:55
* mterry is about to go to lunch16:55
ltinklmterry, nope, not yet but I can do now16:56
mterryltinkl: cool.  We're down to just 8 unapproved branches in silo 41 now  :)16:56
ltinklmterry, how to invoke/test it manually?16:57
mterryltinkl: it's "phablet-config edges-intro --enable" and --disable on your laptop16:58
mterryltinkl: this is a package not for your phone, but your dev machine16:58
ltinklmterry, kk thx16:59
mzanettiuh... the new flashing animation landed apparently16:59
mzanetti"animation" is not the word tho :D17:00
ltinklmzanetti, yeah, I just had it on N4 now17:00
mterrymzanetti: you don't like it?17:00
mzanettiI do17:00
ltinklmzanetti, I like the progress bar17:00
mterrymzanetti: it animates!17:00
mzanettithe progress bar, it moves a bit yeah, it jumped from 0 to 50% in one jump tho17:01
mterrymzanetti: that is by design!17:01
mterrymzanetti: and it also doesn't do the last 5%17:01
mterrymzanetti: the first 50% are supposed to be filled out by the system settings upgrade side before the reboot17:01
ltinklmterry, that is by design? O_o17:01
mterrymzanetti: and the last 5% are after boot17:01
mzanettihah. fancy17:02
mterrymzanetti: but those aren't done yet, and design figured we might as well start somewhere17:02
ltinklyeah, I just saw the Google logo after reboot, no further progress bar17:02
tsdgeosmzanetti: yeah the dashcontent tests are a bit borked because the sdk changed the nameing from X_action_button to X_button so my findChild fail17:03
tsdgeosmzanetti: is this somtehing i can fix tomorrow morning or we need it *now* ?17:03
mzanettitsdgeos, ok... tomorrow, but please first thing17:04
tsdgeosmzanetti: i can do it now if everything else is going to be fixed today17:04
mzanettiI can't promise everything will, I certainly still hope so17:04
tsdgeosok, will do now then17:04
=== vrruiz_ is now known as rvr
=== dandrader|lunch is now known as dandrader
mzanettimterry, how's the conflict going?17:27
tsdgeosmzanetti: there's a test failure it's actually taking a bit more than expected :/17:29
tsdgeosmzanetti: anybody fixing qmltestrunner.ScopeStyle::test_headerBackground ?17:30
mzanettitsdgeos, I'm not aware of someone doing so no...17:37
mzanettitsdgeos, but if it's more, feel free to move it to tomorrow morning17:37
tsdgeosmzanetti: that has nothing to do with me, it's color related17:37
mzanetticolor related17:38
mzanetticimi perhaps can look into it?17:38
tsdgeoswhoever changed that color should fix it :D17:38
tsdgeoswho changed colors?17:39
tsdgeosyou! :D17:39
mzanettihaha17:39
mzanettiI changed a color in the dash?17:39
tsdgeosi don't know17:39
tsdgeos:D17:39
mzanettididn't you just say it was me? :D17:40
tsdgeosyeah but i realized those changes already landed17:40
tsdgeosthe changes i was thinking about i mean17:41
ltinklmterry, tested the "phablet-config edges-intro" change but the tutorial isn't complete... I just get the left edge part and after opening the launcher, nothing else17:43
mzanettiltinkl, if you discover the right edge yourself before the tutorial starts, it won't ever happen17:44
mzanettiltinkl, same for the others basically17:44
ltinklmzanetti, aha17:44
mzanettiltinkl, open the dialoer-app etc for the bottom edge17:44
mzanettiit was working fine when I tested the silo today17:44
ltinklmzanetti, I'm sure I discovered the left one too before :)17:44
mzanettiltinkl, unlikely... doesn't it appear first thing after the wizard has ended?17:45
ltinklmzanetti, not sure, haven't run the wizard (yet), just enabled it using the phablet-config tool17:45
tsdgeosoh no! it was me!17:46
* tsdgeos hides from mzanetti17:46
ltinklmzanetti, but it seems to work fine, I got the bottom edge part now when opening dialer17:46
* mzanetti hunts down tsdgeos17:46
mzanetti:D17:46
mzanettiwhat up?17:46
tsdgeosmzanetti: i did the color changes17:47
mzanetti:)17:47
ltinklmterry, edges-intro approved; anything else to do on https://code.launchpad.net/~unity-team/unity8/sessionIndicatorForDevices/+merge/288940?17:50
tsdgeosmzanetti: ok, so i fixed http://paste.ubuntu.com/15393725/17:52
mzanettitsdgeos, awesome. I hope the otehrs are because of the tablet stage being broken17:53
tsdgeosqmltestrunner.PreviewRatingDisplayTest::test_creation_speed17:53
tsdgeosqmltestrunner.PreviewView::test_title17:53
tsdgeoslooks fishy17:54
mzanettiright17:55
tsdgeosare we including cimi's rework of the rating stuff?17:55
tsdgeosseems not17:55
dandraderI hate the world. Spent 1.5 days making stages mockable for the tutorial only to find out that tutorial-redesign no longer feeds a fake ApplicationManager into a PhoneStage17:55
dandraderat least the code is better now17:56
=== alan_g is now known as alan_g|EOD
tsdgeosmzanetti: https://code.launchpad.net/~unity-team/unity8/fix_ticket_1105_tests/+merge/28908018:02
mzanettithanks a lot tsdgeos!18:02
tsdgeosmzanetti: going to go now, need to do some shopping, ping me on telegram if you need me for something18:02
mzanettiok, cool18:02
mzanettio/18:02
mterrymzanetti: heyo, sorry was lunch + gym.  You asked how the conflict was going, I thought I said I pushed the fix, should be fine19:05
mzanettimterry, yes, builds fine now19:06
mzanettiactually, it just finished building in the silo19:06
mzanettimterry, mind giving the silo a test? I'm at dinner atm19:06
mzanettimterry, or actually, I think you've been getting down the unapproved-count. keep on doing that19:07
mzanettiI'll do the testing in a bit19:07
mterrysure19:10
dednickmzanetti: "Read inputMethod surface from the new property int QtMir" - that ring a bell?19:25
mzanettidednick, yes19:25
dednickmzanetti: it's crashing tryShell/OrientedShell19:25
mzanettidednick, there's a fix for that in silo 4119:25
dednickcreating a surface before there is a window19:26
dednickmzanetti: ah. ok19:26
mzanettidednick, mterry, thanks for the fixes. confirming silo 41 works fine again (for the side stage at least - testing OOBE stuff now)19:32
=== dandrader is now known as dandrader|afk
mterrymzanetti: cool.  we're thinking of removing unity8-schemas again, since it's not needed anymore.  Which would mean we can drop the version number down again, which means we might drop and add unity8 from silo again19:36
mterrymzanetti: I assume we aren't minutes from publishing the silo and that wouldn't be problematic?19:36
ltinkldednick, Build failed: Merge conflict in ~unity-team unity8 shell chrome.19:46
dednickmmm19:46
mzanettiwhere?19:47
mzanettihow did that happen19:47
mzanettiit built like a minute ago19:47
ltinklmzanetti, dednick: Text conflict in qml/Stages/TabletStage.qml19:47
ltinklmzanetti, isn't it caused by my resubmitted tsdgeos' branch?19:47
ltinklmzanetti, yeah I wonder how it built before when there was that conflict19:48
mzanettidednick, you just merged with trunk, didn't you?19:48
dednickmzanetti: seconds ago.19:48
mzanettiat least the commit message says so19:48
ltinklaha19:48
mzanettidednick, revert please, merge in your prereq19:48
mzanettiwell, I can try to build19:49
mzanettibut it will probably criss-cross19:49
ltinklmzanetti, shall I revert https://code.launchpad.net/~unity-team/unity8/fix_ticket_1105_tests/+merge/289087 or is it fine like this?19:51
mterrydednick: unity8/shell-chrome has merge conflicts19:51
dednickmterry: yes.19:51
mterrydednick: oh I see above  :)19:51
* mterry is late to the party19:51
ltinklmterry, I guess he knows already ;)19:52
mzanettiltinkl, don't know. need to test if it builds19:53
mzanettilooks ok I'd say19:53
ltinklmzanetti, ok, won't touch it again :)19:53
mzanettidednick, yeah, failed with criss-cross merge20:02
dednickmzanetti: :/ seems to merge fine with trunk...20:03
dednickit's the changes from unity8-ubuntu-xenial-landing-06420:03
dednickseemingly.20:03
=== dandrader|afk is now known as dandrader
mzanettidednick, yeah, but merges need to happen through the chain20:05
mterrydednick: you can rebase on tutorial-redesign, I think that's near the top of the current tower-of-MPs20:05
mzanettioh dear...20:06
dednickmterry: no, then i would depend on you.20:06
mzanettiit's based on side stage redesign, which in turn is based on oobe20:07
mzanettibut it was building before20:07
dednickalthough might be ablt to only get your merge.20:07
mterrydednick: what's wrong with depending on me?  what do you mean20:07
dednickmterry: your branch already depends on mine down the chain.20:07
mterrydednick: right, on side-stage-redesign.  I thought we were talking about rebasing shell-chrome20:08
dednickor not20:08
mzanettisorry guys... need to leave you for a bit... the baby acts like it would die20:08
dednickor right. i thought it was on shell chrome.20:08
mzanettibbiab20:08
dednicklol. ok!20:09
dednicki got to go for a bit as well. need to go pick up gf from train station.20:09
mterrydednick: maybe I should have based on shell-chrome when I put tutorial-redesign on top of stack, but didn't know it was placed like it was20:09
mterrydednick: OK, if you're heading out I can rebase tutorial-redesign20:09
dednickmterry: meh.20:09
dednickyou can rebase sidestage as well if you like ;)20:10
mterry?20:10
mterrymaybe I don't understand the problem20:10
dednickjust getting you to do my work for me. nvm :)20:10
mterryI assumed shell-chrome and tutorial-redesign were conflicting20:10
mterryIs there something else conflicting?20:10
mterryhaha, it's those two stupid isDash & appId properties again20:12
mterrydednick: ok I'm rebasing on top of shell-chrome20:12
* mterry kicks off build20:14
mzanettiok. here again...20:22
mzanettimterry, can I help?20:22
mzanettiah ok. I see it should in theory be solved20:24
ltinklmzanetti, mterry: meh, conflict again20:35
mzanettistill the shell chrome one20:35
mzanettiWarning: criss-cross merge encountered.  See bzr help criss-cross.20:35
mzanettiok, I'm gonna fix, don't touch :)20:38
mzanettiI hope :D20:38
mzanettiok... should work now20:42
mterrymzanetti: I didn't think it would be criss-cross, since there weren't any new merges in between20:43
mterrymzanetti: ah well20:43
mzanettimterry, the criss cross was in shell_chrome20:43
mterrymzanetti: ah20:43
mzanettimterry, it had sidestage redesign as prereq20:43
mterryright20:43
mzanettiI fixed the duplicate property there20:43
mzanettidednick merged the chrome one with trunk instead of the rereq20:43
mzanettilets see if it builds now20:43
mzanettimterry, I'm a bit puzzled what you merged then before :)20:44
dednickhm? i'm merging sidestage into shell chrome now.20:44
mzanettidednick, no20:45
mzanettidon't20:45
mzanettiI did20:45
mterrymzanetti: I got a conflict between shell-chrome and tutorial-redesign, so I figured I'd rebase20:45
dednickmzanetti: oh. k20:45
mzanettimterry, lets see if bzr can digest that20:45
mzanettibut worst case we just gotta merge that one thing down the chain now and it should be ok20:46
dednicki've gota run in a minute.20:46
mzanettiI'm still a bit worried about test failures... the last runs didn't look so great20:46
mzanettidednick, I guess I'll take it from here...20:46
mzanettinope. still conflicting20:46
mzanettidammit20:46
dednickshell chrome?20:46
mzanettioh... overwrite would help20:46
mzanettimy bad20:46
dednickyeah. didnt see any changes :) was wondering.20:47
mzanettiyeah, i reverted the trunk-merge, then did the other20:47
mzanettididn't pay attention to the push failing :/20:47
dednickmzanetti: i'll stay online. just busy getting dinner together/eating/etc...20:47
dednicki got loads of conflicts merging sidestage..20:48
mterrymzanetti: gosh dang it20:57
mterryfixing20:58
mterrymzanetti: fixed21:00
mterrymzanetti: had to uncommit, remerge, and overwrite, so I think it's clean now21:00
* mterry rebuilds21:00
* mterry just rebuilt unity8, hope that's all we expected to change21:00
mterryseems to have all merged21:12
ltinklmterry, not sure about the latest version of ubuntu-system-settings/hwKeyboardMinimal21:14
* ltinkl checking21:14
mterryltinkl: you mean it might need a rebuild too?21:14
ltinklmterry, guess not, latest version from 16.04.20160315, latest commit from yesterday21:15
mzanettiwhitespace test21:32
mterrymzanetti: just saw that  :(21:41
mterrymzanetti: I don't think it's anywhere in the tutorial-redesign stack21:42
mzanettithe whitesoace?21:42
mzanettialready fixed it21:42
mterrymzanetti: nice21:42
mzanettifinally... uploading build22:10

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!