| === nudtrobert1 is now known as nudtrobert | ||
| === Guest42341 is now known as supadupa | ||
| Saviq | mzanetti, https://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1270/ is panel-button-fixes, look like regressions | 10:40 |
|---|---|---|
| Saviq | @unity: _vivid_ CI should be all SUCCESS today, wily is broken, we'll move to xenial soon | 10:40 |
| Saviq | so if your vivid CI isn't green, needs investigation | 10:40 |
| mzanetti | ack | 10:41 |
| mzanetti | Saviq, actually those are the new tests added with that branch :D | 10:41 |
| mzanetti | will investigate | 10:41 |
| Saviq | kk | 10:41 |
| guest123124 | in xenial the mouse pointer is off or the mouse is not working in unity8 | 10:49 |
| guest123124 | i can't login | 10:49 |
| guest123124 | are there any keyboard shortcuts to log-in? | 10:50 |
| greyback | guest123124: nothing at all responding to mouse? You see a cursor & can move it around? | 10:50 |
| guest123124 | after login into lightdm the mouse pointer is not shown anymore, and even if i blind click on the indicators it does nothing | 10:52 |
| guest123124 | the mouse seems off | 10:52 |
| Saviq | guest123124, xenial does not have the latest things yet, unity8 didn't migrate yet | 10:52 |
| guest123124 | ah, ok then :D | 10:52 |
| Saviq | soon | 10:52 |
| guest123124 | testing again later, thanks Saviq | 10:52 |
| Saviq | guest123124, might wanna /nick | 10:53 |
| === guest123124 is now known as nick1235 | ||
| nick1235 | Saviq, done | 10:53 |
| nick1235 | :P | 10:53 |
| Saviq | nick1235, you can monitor the migration in https://launchpad.net/ubuntu/+source/unity8 (or enable proposed if you want) | 10:53 |
| nick1235 | yep i was thinking of enabling proposed | 10:54 |
| nick1235 | but later, i'm not that brave in the morning | 10:54 |
| Saviq | being on xenial is brave enough still ;) | 10:55 |
| nick1235 | :)) | 10:55 |
| mzanetti | Saviq, pushed a fix | 11:18 |
| Saviq | tx | 11:18 |
| Saviq | cimi, please merge lp:~cimi/unity8/sdk1.3_newUbuntuShape into lp:~cimi/unity8/wide-preview-zoomable-videoplayback as it's a prerequisite, but isn't in the branch - that's where the apparent conflict comes from | 11:51 |
| cimi | Saviq, I think I did :/ | 11:51 |
| Saviq | cimi, you did merge something, but not that | 11:51 |
| cimi | oh no I did in preview-sharing | 11:51 |
| Saviq | cimi, whatever you did merge in preview-sharing, you should've merged wide-preview in it, after having merged shape in it first | 11:52 |
| cimi | pushed | 11:52 |
| cimi | let's see preview-sharing | 11:52 |
| Saviq | cimi, also, please don't paste the changelog entry into commit msg, better say which branch is this a merge from | 11:52 |
| cimi | Saviq, oki for next time | 11:53 |
| cimi | ok they should both be fine now | 11:53 |
| Saviq | k, kicked ci for them | 11:54 |
| Saviq | tsdgeos, can you please merge Cimi's wide preview into lp:~aacid/unity8/scope_settings_keyboard_scroll | 11:54 |
| tsdgeos | didn't i do that already? | 11:56 |
| * tsdgeos has a dejavu | 11:56 | |
| tsdgeos | ah maybe do it again | 11:56 |
| Saviq | tsdgeos, yeah, but cimi didn't merge his branches properly before | 11:56 |
| Saviq | tsdgeos, yes, remerge | 11:56 |
| tsdgeos | Saviq: done | 11:57 |
| Saviq | tx | 11:57 |
| cimi | Saviq, what was the silo you built? | 11:58 |
| Saviq | cimi, 21 | 11:58 |
| Saviq | https://requests.ci-train.ubuntu.com/#/ticket/564 | 11:58 |
| cimi | cool, testing | 11:58 |
| cimi | (when is built) | 11:59 |
| Saviq | cimi, I'll rebuild it now so give it an hour or so | 12:00 |
| Saviq | @unity: unity8 migrated to xenial, so we're in sync between vivid+overlay and xenial again (note wily is done'n'dusted, we don't care for it any more) | 12:09 |
| mzanetti | nice! | 12:10 |
| === dandrader is now known as dandrader|afk | ||
| nick1235 | r.i.p wily | 12:16 |
| tsdgeos | ubuntu::connectivity::NetworkingStatus thinks i'm offline | 12:25 |
| * tsdgeos shakes fist | 12:25 | |
| ltinkl | tsdgeos, ye that thing is unreliable lately; my router went offline and back online yesterday and unity8 didn't notice at all, had to disable and re-enable networking | 12:26 |
| tsdgeos | it's very bad that this thing doesn't work | 12:27 |
| tsdgeos | since if it thinks we're offiline we don't do any qnam request | 12:27 |
| ltinkl | tsdgeos, yup, on the phone, the dash fails to refresh the nearby and today scopes | 12:29 |
| Saviq | I wonder if tg2 not sending msgs for me is the same issue | 12:29 |
| ltinkl | tsdgeos, it won't even reconnect to my router when it comes back online | 12:29 |
| tsdgeos | qdbus com.ubuntu.connectivity1 /com/ubuntu/connectivity1/NetworkingStatus com.ubuntu.connectivity1.NetworkingStatus.Status | 12:35 |
| tsdgeos | ltinkl: Saviq: on the phone ↑ | 12:35 |
| tsdgeos | food! | 12:35 |
| === dandrader_ is now known as dandrader | ||
| ltinkl | tsdgeos, will do once that happens again | 12:36 |
| === alan_g is now known as alan_g|lunch | ||
| nick12340 | ok, so now the mouse is working on unity8/xenial | 13:11 |
| nick12340 | but i get a black window with xmir, am i doing something wrong? Xmir :0 --desktop_file_hint=geany.desktop | 13:11 |
| nick12340 | tried -sw -damage still nothing | 13:11 |
| mhall119 | Saviq: now that silo 22 has landed, are you going to keep using it for new Mir/Unity work? | 13:12 |
| mhall119 | I'm wondering if I should keep using it or removeit from my apt sources | 13:12 |
| greyback_ | mhall119: you can remove, we won't hold on to that silo | 13:18 |
| kgunn | which reminds me... | 13:18 |
| mhall119 | thanks greyback_ | 13:20 |
| greyback_ | kgunn: killing silo0? | 13:20 |
| kgunn | greyback_: yep, abandoned | 13:21 |
| greyback_ | yay | 13:21 |
| greyback_ | kill the undead | 13:21 |
| ltinkl | :) | 13:23 |
| === nudtrobert1 is now known as nudtrobert | ||
| kgunn | ltinkl: so @mouse scroll...yep, works for browser, i was actually testing things like dash or u-s-s | 13:57 |
| kgunn | so you can grab and drag the window up, but you can't wheel-scroll | 13:57 |
| kgunn | kind of a small issue... | 13:57 |
| kgunn | since user can at least grab now | 13:57 |
| === alan_g|lunch is now known as alan_g | ||
| dandrader | AlbertA, ping | 14:05 |
| ltinkl | kgunn, hmm weird, that also works fine here | 14:08 |
| Saviq | kgunn, ltinkl I think there's a state when wheel doesn't work in the dash, for example, but not sure why that is... I initially thought the dash doesn't scroll (because well, it didn't...) but then some time later it did work... | 14:09 |
| Saviq | so we need to do some investigation there | 14:09 |
| ltinkl | Saviq, ye it looks like a focus issue | 14:09 |
| ltinkl | Saviq, sometimes it (dash) doesn't respond to the wheel until I grab it and flick it manually | 14:10 |
| Saviq | ltinkl, right | 14:11 |
| Saviq | tsdgeos, qdbus isn't available on the phone by default is it? | 14:11 |
| tsdgeos | Saviq: no | 14:11 |
| ltinkl | tsdgeos, it isn't | 14:11 |
| ltinkl | had to manually install it as well | 14:11 |
| tsdgeos | gbdus is but its syntax is awful | 14:12 |
| tsdgeos | -b+d | 14:12 |
| ltinkl | apt-get install qdbus-qt5 | 14:13 |
| Saviq | ltinkl, yeah, not when people have their phones ro | 14:15 |
| Saviq | https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1507769/comments/14 works | 14:15 |
| AlbertA | dandrader: pong | 14:15 |
| ltinkl | ah right | 14:15 |
| ubot5 | Launchpad bug 1507769 in unity8 (Ubuntu) "App store does not display images" [High,Confirmed] | 14:15 |
| ltinkl | Saviq, so why do we use com.ubuntu.connectivity1.NetworkingStatus and not the same thing provided by NM itself? | 14:16 |
| Saviq | ltinkl, no idea, maybe NM doesn't have enough info or something, I know Qt has API for that, too, but again - maybe not extensive enough | 14:19 |
| Saviq | those would be my guesses | 14:19 |
| Saviq | or no QML API | 14:19 |
| tsdgeos | Saviq: mzanetti: what about this? https://code.launchpad.net/~aacid/unity8/warn_using_only_cache/+merge/275851 | 14:21 |
| tsdgeos | ltinkl: it used to fail so we switched to our thing | 14:21 |
| mzanetti | tsdgeos, looks ok I guess. shouldn't it be a qWarning() tho? | 14:22 |
| mzanetti | (assuming eventially we'll add message filters this seems it should still be printed even if random debug stuff is filtered) | 14:23 |
| tsdgeos | mzanetti: no big opinion on debug/warning, in Qt qWarinng are usually yhings you're doing wrong and can fix, but we're not Qt so we can do whatever we want for warning :D | 14:24 |
| mzanetti | right... | 14:24 |
| ltinkl | tsdgeos, looks like ours fails the same :) | 14:24 |
| mzanetti | actually atm it mostly doesn't matter indeed | 14:24 |
| mzanetti | we should eventually move to QMessageLogger tho | 14:24 |
| tsdgeos | ltinkl: well it was a false alarm, it is just that the thing doesn't run on the desktop so i was getting all the things to fail | 14:25 |
| mzanetti | so that we can enable DDA prints without recompiling etc | 14:25 |
| tsdgeos | nice way to spend the morning | 14:25 |
| ltinkl | qCDebug()/qCWarning()? | 14:27 |
| tsdgeos | we don't use those at the momnet, we probably should, but don't think it's fair to ask this MR to add them | 14:30 |
| ltinkl | tsdgeos, sure, for later | 14:30 |
| Saviq | mterry, hey, can you please merge trunk in https://code.launchpad.net/~mterry/unity8/shutdown-dialog-on-resume/+merge/275240 so we can see some CI greenness? | 14:47 |
| mterry | Saviq, oh ok | 14:53 |
| mterry | Saviq, no conflicts. Does CI not merge trunk first anyway? | 14:54 |
| Saviq | mterry, I agree, CI should always take trunk, merge branch, only then test | 14:54 |
| Saviq | mterry, yeah, unfortunately it doesn't | 14:54 |
| mterry | huh | 14:54 |
| Saviq | it tests the branch directly | 14:54 |
| mterry | I feel like I keep forgetting that :) | 14:54 |
| mterry | Saviq, updated | 14:54 |
| Saviq | tx | 14:55 |
| mterry | Saviq, OK, updated my three no-touch-no-lifecycle branches. No conflicts, but I did bump unity-api version again | 15:48 |
| Saviq | mzanetti, ↑ | 15:50 |
| Saviq | mterry, you might need to bump it even more after silo 21 lands, as dednick's occlusion branches bump it, too, unless we land the two together | 15:51 |
| mterry | Saviq, got it. Easy to bump. But also... let's just land no-touch-no-lifecycle... | 15:51 |
| Saviq | mterry, sure, if it's ready to go | 16:01 |
| mterry | Saviq, well it needs final reviews. But I think it's ready to go | 16:02 |
| mterry | greyback_, do you like teh qtmir no-touch-no-lifecycle branch now? | 16:03 |
| greyback_ | mterry: I do now, yes. CI still unhappy tho | 16:04 |
| mterry | greyback_, that's because unity-api is bumped. It can't compile | 16:05 |
| greyback_ | ah yes | 16:05 |
| greyback_ | mterry: can you please add the checklist with the required unity-api MR listed there | 16:05 |
| mterry | greyback_, I thought I linked the MR | 16:05 |
| mterry | let me see | 16:05 |
| greyback_ | mterry: ah you did, wrong tab | 16:06 |
| mterry | greyback_, didn't do the formal checklist though. I'll add that | 16:06 |
| mterry | done | 16:07 |
| greyback_ | mterry: ack. Will give it all a test today/tomorrow | 16:08 |
| mterry | greyback_, great thanks! | 16:09 |
| * greyback_ wishes CI was smart enough to read checklist, and compile all packages ready for testing | 16:09 | |
| Saviq | dednick, mterry, greyback_, I added occlusion and lifecycle to silo 21 | 16:20 |
| Saviq | dednick, mterry, it's building now, please monitor for conflicts if you can see and fix any https://ci-train.ubuntu.com/job/ubuntu-landing-021-1-build/216/console | 16:21 |
| dednick | ah. i was just doing that :) | 16:21 |
| greyback_ | Saviq: could this be added too? https://code.launchpad.net/~alan-griffiths/qtmir/test-harness-for-MirWindowManager/+merge/274221 | 16:21 |
| Saviq | greyback_, doing | 16:21 |
| greyback_ | thans | 16:21 |
| greyback_ | thanks ants.... thants | 16:22 |
| dednick | yay. i'm conflicting! | 16:22 |
| Saviq | dednick, you need to merge trunk / bump to .102 | 16:22 |
| dednick | hm. i did yesterday | 16:22 |
| dednick | oh, maybe i didnt push | 16:22 |
| dednick | rebuilding | 16:24 |
| dednick | eh. | 16:28 |
| Saviq | dednick, you might wanna just not modify changelog | 16:33 |
| Saviq | dednick, otherwise you'd need to make it same as mterry's | 16:34 |
| * Saviq gone for a while, biab | 16:34 | |
| dednick | Saviq: i've resubmitted and pre-reqed mterrys branch | 16:34 |
| mterry | dednick, ah thanks | 16:35 |
| === davidcalle is now known as davidcalle_afk | ||
| pstolowski | Saviq, mzanetti hey, question - shell plugin has a single translatable string and ships translations for it; i guess it cannot just set text domain with unity-plugin-scopes package name? | 17:10 |
| mzanetti | hmm... that might work... | 17:16 |
| mzanetti | but would need to try. albert is probably able to tell you from the top of his head tomorrow morning | 17:17 |
| mzanetti | pstolowski, ^ | 17:17 |
| pstolowski | mzanetti, my only concern is since it's a plugin, doing this would affect other plugins which may do the same? | 17:24 |
| === pstolowski is now known as pstolowski|afk | ||
| mterry | mzanetti, hrm ~unity-team/unity8/new_fix_upsidedown conflicts with my refactoring in no-touch-no-lifecycle | 18:00 |
| mterry | I'll rock-paper-scissors you for who deps on who :) | 18:00 |
| mzanetti | haha | 18:01 |
| mzanetti | mterry, seems new_fix_upstream is easier to rebase | 18:01 |
| mzanetti | mterry, since I have you here, did you test your no-touch-no-lifecycle on the -pd image? | 18:03 |
| mzanetti | I can't seem to be able to run legacy apps | 18:03 |
| mterry | mzanetti, I tested it by manually tweaking desktop files of touch apps and noting that they were were no longer lifecycled | 18:03 |
| === alan_g is now known as alan_g|EOD | ||
| mzanetti | ah ok | 18:04 |
| mterry | mzanetti, so I don't know why legacy apps wouldn't run, but I didn't try that code path | 18:04 |
| mterry | mzanetti, do you only have that problem with my branch or in general? | 18:04 |
| mzanetti | no, in general... just trying to find evidence that it *should* work before I spend too much time figuring things | 18:04 |
| mterry | ok :-/ | 18:05 |
| * mterry hasn't tried full blown PD yet | 18:05 | |
| mzanetti | mterry, I've rebased the fix_upsidedown branch. but you had a great idea... we need a rock-paper-scissors app :D | 18:40 |
| mzanetti | so we actually do that next time | 18:40 |
| mterry | mzanetti, hah :) | 18:41 |
| mterry | mzanetti, a plugin for ubot would be good | 18:41 |
| mterry | mzanetti, thanks for rebase. Will try to build silo 21... | 18:41 |
| === pstolowski|afk is now known as pstolowski | ||
| Saviq | mterry, fix-upsidedown is actually josharenson's, and it already depends on panel-button-fixes, so rebasing yours on top would be easier IMO | 19:21 |
| mterry | hmph ok... mzanetti how far are you on rebasing? | 19:22 |
| mzanetti | mterry, I merged, but I have some issues with tests | 19:22 |
| mzanetti | mterry, seems the tests you added are breaking. so probably I messed up with the merge | 19:23 |
| mterry | mzanetti, maybe my tests broke in the past and I didn't notice because CI is broken for my branches (depends on newer unity-api) | 19:23 |
| mterry | mzanetti, let me test in my pristine branch | 19:23 |
| mzanetti | mterry, nope. I ran your branch alone already. passing there | 19:25 |
| mterry | mzanetti, and this is why you should never add tests ;) | 19:26 |
| mterry | mzanetti, well was the merge hard? I'm realizing that it might be better to have my MP as the leaf, since it breaks CI (with the unity-api bump). The fewer branches we have with uncheckable CI, the better | 19:28 |
| mzanetti | mterry, no. the merge should be really easy if you know your branch | 19:28 |
| mterry | alright, let me try | 19:28 |
| mzanetti | mterry, re-merge panel-button-fixes to the other first | 19:29 |
| mzanetti | mterry, it'll fix the two failing tests there | 19:29 |
| mzanetti | applies without conflict | 19:29 |
| mterry | mzanetti, doesn't lp:~unity-team/unity8/new_fix_upsidedown include that already? | 19:29 |
| mterry | or you're just saying for easier merge of that | 19:30 |
| mterry | to clear tests first | 19:30 |
| * mterry is picking up what you're putting down | 19:30 | |
| === davidcalle_afk is now known as davidcalle | ||
| kgunn | silo 21 seems to add a new oddity to windowed mode, the phone app is forcing rotation to portrait on the n7 | 19:51 |
| Saviq | josharenson, can you comment, sounds related to your orientation work ↑? | 19:52 |
| SturmFlut | Dear Unity8 team, I just connected my Ubuntu Nexus 4 to a projector, coupled keyboard and mouse via Bluetooth and the phone turned into a desktop. You guys are my personal heroes and this message is good for a beer if we ever meet in person ;) | 19:54 |
| Saviq | kgunn, otoh: | 19:55 |
| Saviq | $ grep Orientation /usr/share/applications/dialer-app.desktop | 19:55 |
| Saviq | X-Ubuntu-Supported-Orientations=portrait | 19:55 |
| Saviq | SturmFlut, glad it's working for you | 19:55 |
| Saviq | kgunn, ah but also: | 19:56 |
| Saviq | $ grep Stage /usr/share/applications/dialer-app.desktop | 19:56 |
| Saviq | X-Ubuntu-StageHint=SideStage | 19:56 |
| Saviq | so it should end up in sidestage | 19:56 |
| kgunn | SturmFlut: :) thanks for the kind words | 19:57 |
| kgunn | Saviq: there's no sidestage in windowed mode tho | 19:57 |
| kgunn | (i thot) | 19:57 |
| Saviq | kgunn, ah now I know what you mean | 19:57 |
| Saviq | kgunn, you sure it wasn't the case before silo 21? | 19:58 |
| kgunn | add video to bug 1510360 | 19:58 |
| ubot5 | bug 1510360 in unity8 (Ubuntu) "maximize, close, launch goes full screen with no buttons" [High,In progress] https://launchpad.net/bugs/1510360 | 19:58 |
| kgunn | Saviq: wrt rotation...i _think_ but i can't promise | 19:58 |
| Saviq | kgunn, but yeah, I think josharenson's branch might have broken that https://code.launchpad.net/~unity-team/unity8/new_fix_upsidedown/+merge/275683 | 19:58 |
| kgunn | i was testing phone late last night (w/o silo21) and didn't see it | 19:58 |
| josharenson | it probably did. that branch touches a lot of rotation stuff | 19:59 |
| kgunn | but i might have only been on nexus4 | 19:59 |
| kgunn | ok...i have to run one more freakin' errand bbiab | 20:00 |
| Saviq | josharenson, sounds like we're missing a test then | 20:01 |
| Saviq | josharenson, it might be as simple as supportedOrientations: root.useNativeOrientation | 20:04 |
| Saviq | which the previous implementation had for desktop, and it doesn't now | 20:04 |
| josharenson | Saviq: ill take a look | 20:04 |
| attente | kgunn: hi, do you know if multiple surface apps are working or not on the phone? | 20:16 |
| Saviq | attente, not yet | 20:26 |
| Saviq | mterry, I merged panel-button-fixes to new-fix-upsidedown, you will rebase yours on top of the latter? | 20:26 |
| attente | Saviq: ok, thanks | 20:26 |
| mterry | Saviq, uh yeah. whoops, I got distracted by something else, will get back on that... :-/ | 20:26 |
| kgunn | so if i'm in windowed mode and hold down the power key....shouldn't the power off prompt still come up ? (not connected to monitor either) | 20:45 |
| Saviq | kgunn, no, the phone is still a phone | 20:46 |
| Saviq | kgunn, at least that's the current thinking - you don't reboot, shut down your phone, regardless what peripherals it has connected | 20:46 |
| * kgunn thinks you mean yes | 20:48 | |
| Saviq | truth be told you barely do that with your laptop these days | 20:48 |
| Saviq | kgunn, ah, hold, yes | 20:48 |
| Saviq | not on press | 20:48 |
| kgunn | right...power dialog never appeared | 20:48 |
| kgunn | just shut off | 20:48 |
| Saviq | ltinkl, ↑ | 20:49 |
| kgunn | ok, it seems inconsistent.... | 20:49 |
| kgunn | actually seems like dialog just takes too long to appear (so it powered off one time) | 20:50 |
| kgunn | i think i saw mterry talking to pat about it ^ | 20:50 |
| mterry | kgunn, I've seen dialog take too long if system is loaded and unity8 doesn't get around to it | 20:50 |
| kgunn | hmmm...no load per se | 20:51 |
| mterry | kgunn, but pat says his system wasn't loaded | 20:51 |
| mterry | yeah... hm | 20:51 |
| kgunn | in fact just booted | 20:51 |
| kgunn | i'm on n7 ubunt-pd+silo21 fwiw | 20:51 |
| kgunn | also...if i doublt tap the power button, i get the power dialog | 20:51 |
| mterry | kgunn, silo21 was built? i thought it had problems | 20:51 |
| kgunn | did it? i heard my morning to give it a shot | 20:52 |
| Saviq | kgunn, mterry it did built, but we've added more since | 20:53 |
| Saviq | *build | 20:53 |
| mterry | Saviq, just tried rebuilding with my rebased branch | 20:53 |
| Saviq | and that's what we're having confilcts with | 20:54 |
| * mterry crosses fingers | 20:54 | |
| Saviq | mterry, ack | 20:54 |
| Saviq | mterry, halt | 20:57 |
| mterry | .. already started it | 20:57 |
| mterry | oh it failed | 20:57 |
| Saviq | mterry, well, it conflicted still, but regardless, bump Ubuntu.Components import to 1.3 | 20:57 |
| mterry | ah yes | 20:58 |
| mterry | wonder why it conflicted on same files... what else touches those... | 20:59 |
| Saviq | mterry, there's like 4 branches in total that touch it | 21:00 |
| Saviq | sdk_13, quick_24, that might be where it's conflicting | 21:00 |
| Saviq | not sure we'll manage to land it all together, there's too many branches touching the same bits | 21:00 |
| Saviq | let me try and reproduce the conflict | 21:01 |
| mterry | not sdk_13... | 21:02 |
| Saviq | mterry, more than likely it's bzr being a bitch again | 21:03 |
| Saviq | mterry, yeah, criss-cross | 21:06 |
| mterry | Saviq, I've seen that message before, but it never caused a problem for me, usually bzr figures it out. What do we do here? | 21:07 |
| Saviq | mterry, don't think we can do much, basically your branch would need two prerequisites | 21:08 |
| Saviq | bug #1313697 fwiw | 21:08 |
| ubot5 | bug 1313697 in CI Train [cu2d] "Train should try --weave if criss-cross merge is detected" [Undecided,Incomplete] https://launchpad.net/bugs/1313697 | 21:08 |
| Saviq | but afaict weave is dangerous | 21:08 |
| Saviq | the result might not be what you think it'd be | 21:08 |
| mterry | Saviq, alright. so delay my branch? Bugger | 21:09 |
| Saviq | mterry, but yeah, that's a conflict in bzr's mind http://pastebin.ubuntu.com/12983110/ | 21:10 |
| mterry | Saviq, I wonder if moving that block elsewhere in the file would help | 21:10 |
| Saviq | mterry, there's other conflicts that are not as simple | 21:11 |
| mterry | hm | 21:11 |
| Saviq | mterry, but yeah, it's dumb | 21:11 |
| mterry | Saviq, we could do two landings right after each other? | 21:12 |
| Saviq | mterry, sure, just trying to understand this first | 21:12 |
| Saviq | mterry, that's the extent of the conflicts http://pastebin.ubuntu.com/12983218/ | 21:14 |
| Saviq | so it's really stupid | 21:14 |
| mterry | Saviq, yup. Those are the results of me merging in the other pre-req branch | 21:15 |
| Saviq | mterry, there's only one way I can think of, and that's actually replaying the commits from your branch on top of the prerequisite | 21:17 |
| * Saviq tries | 21:17 | |
| Saviq | owait | 21:18 |
| mterry | Saviq, hrm, would mean renumbering commits, but ok. I think mzanetti might have had a branch depending on mine, but as long as he knows... | 21:18 |
| kgunn | Saviq: fwiw, also seeing absolutely random reboots with silo 21...more than once, i'm not even interacting with the device, haven't connected with monitor even | 21:21 |
| kgunn | and it just reboots on it's own | 21:21 |
| Saviq | mterry, ok got it | 21:21 |
| Saviq | mterry, you need to undo the trunk merge | 21:21 |
| mterry | Saviq, hah. dang it bzr | 21:22 |
| Saviq | mterry, so uncommit until you go past the trunk merge | 21:22 |
| Saviq | mterry, re-commit the 1.3 bit | 21:22 |
| Saviq | mterry, merge (conflicts) new-fix-upsidedown | 21:22 |
| Saviq | mterry, then it will work | 21:22 |
| mterry | yup | 21:22 |
| mterry | will try | 21:22 |
| Saviq | mterry, checked, it does | 21:22 |
| Saviq | only didn't fix the conflict proper | 21:22 |
| Saviq | mterry, bzr hates it when you have interleaved merges from the same branch into two consecutive branches | 21:23 |
| Saviq | kgunn, ouch, care to try clearing /var/log (sudo find /var/log /var/crash -type f -exec rm {} +) | 21:24 |
| Saviq | kgunn, and check stuff out the next time it happens | 21:24 |
| kgunn | sure | 21:24 |
| mterry | Saviq, my understanding is that the silo will handle --overwrite. Correct? | 21:26 |
| Saviq | mterry, yeah, no problem | 21:26 |
| Saviq | mterry, it starts from scratch every time | 21:27 |
| Saviq | kgunn, could also be useful to look at logcat... not sure how to find the reboot point there though | 21:27 |
| Saviq | also I remember seeing something about a... foo.last log file that gets rotated on reboot, not sure where to find that, or maybe it was a flash-related thing | 21:28 |
| Saviq | so recovery | 21:28 |
| mterry | Saviq, alright building again | 21:30 |
| Saviq | mterry, tx | 21:31 |
| Saviq | lookin' good | 21:34 |
| mterry | Saviq, :( | 21:35 |
| Saviq | aaand it conflicted | 21:35 |
| Saviq | but that we can probably solve | 21:35 |
| Saviq | since that branch doesn't prereq anything yet | 21:35 |
| * Saviq steals from dednick | 21:35 | |
| mterry | :) | 21:36 |
| mterry | Saviq, might be easier if we had a policy of pushing to ~unity-team | 21:37 |
| Saviq | mterry, well, have to resubmit in this case anyway, not a huge gain | 21:37 |
| Saviq | mterry, but yeah, I've been pondering that | 21:38 |
| Saviq | hmm not a trivial conflict | 21:40 |
| Saviq | ok thanks mzanetti, conflict more trivial than I thought | 21:46 |
| Saviq | mterry, one more try https://ci-train.ubuntu.com/job/ubuntu-landing-021-1-build/221/console | 21:46 |
| Saviq | I kicked with force to rebuild all packages | 21:47 |
| Saviq | it wouldn't have built unity-api, qtmir or qtubuntu otherwise, bug in train wrt failed builds | 21:48 |
| Saviq | huuh there's more conflicts now instead of less... wtf | 21:52 |
| Saviq | ah criss cross again, /me resolves | 21:52 |
| Saviq | let's see if I have to go back all the way... | 21:55 |
| Saviq | in your face, bzr! | 21:59 |
| josharenson | greyback__: if you have a chance, can you take a look at ShellApplication.cpp in https://code.launchpad.net/~josharenson/unity8/slim_greeter_real_lightdm/+merge/271614 I merged a hack that I had before, and wanted to make sure it won't break multi-monitor (I plan to test it on another monitor in a bit) | 22:09 |
| Saviq | kgunn, silo 21 is rebuilding whole, should be done in an hour or so https://ci-train.ubuntu.com/job/ubuntu-landing-021-1-build/223/console if you want to have a look | 22:16 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!