| === tedg_ is now known as tedg | ||
| === davidcalle_ is now known as davidcalle | ||
| === Dmitrii-Sh_ is now known as Dmitrii-Sh | ||
| === FourDollars_ is now known as FourDollars | ||
| didrocks | good morning | 06:06 |
|---|---|---|
| duflu | Morning didrocks | 06:15 |
| didrocks | hey duflu | 06:19 |
| duflu | I made a great discovery yesterday. But so far am being met with skepticism and criticism. Maybe more people should test it: https://gitlab.gnome.org/GNOME/mutter/merge_requests/168 | 06:19 |
| gitlab-bot | GNOME issue (Merge request) 168 in mutter "clutter: Remove input lag and cursor stutter [performance]" (comments: 4) [Opened] | 06:20 |
| seb128 | good morning desktopers | 06:27 |
| didrocks | hey seb128 | 06:33 |
| duflu | Morning seb128 | 06:35 |
| seb128 | hey didrocks, duflu | 06:35 |
| seb128 | how are you today? | 06:35 |
| duflu | seb128, not great. Awake since 5am for some reason. You? | 06:36 |
| seb128 | I'm good, up at 6:10 today but I don't feel too tired | 06:37 |
| seb128 | it's somewhat nice, I already clear my emails backlog, dropped the kid to childcare, had coffee and it's only 8:30 | 06:38 |
| duflu | seb128, yeah days like today I appreciate having time for pilates | 06:38 |
| duflu | and not just rushing to my desk | 06:38 |
| seb128 | you do pilates in the morning? | 06:39 |
| duflu | seb128, only when I have time. Not often mid week any more | 06:39 |
| * seb128 is not a morning person, I've difficulties doing any sort of exercice in the first hour after I wake up | 06:39 | |
| duflu | Stretching doesn't raise the heartrate | 06:39 |
| duflu | Unless you're in fear of over stretching | 06:40 |
| seb128 | I've not really flexible, even less in the morning :p | 06:44 |
| seb128 | like I would be able to touch my knee with my hand, maybe my ankle but not my foot | 06:44 |
| duflu | seb128, yeah I was the same a few years ago. Still not great only doing it once or twice a week. But daily seemed to cause more problems than it solved | 06:46 |
| === pstolowski|afk is now known as pstolowski | ||
| oSoMoN | good morning desktoppers | 07:30 |
| oSoMoN | didrocks, can you add me to the team so that I can assign myself communitheme bugs? see https://github.com/ubuntu/communitheme/issues/350#issuecomment-406173316 | 07:31 |
| gitlab-bot | ubuntu issue 350 in communitheme "libreoffice not opening properly on communitheme.snap" (comments: 18) [Snap, Closed] | 07:31 |
| oSoMoN | unless this is a restricted team for active contributors to the theme only | 07:31 |
| didrocks | oSoMoN: done! | 07:33 |
| didrocks | et salut ;) | 07:33 |
| duflu | Hi oSoMoN | 07:36 |
| Trevinho | morning | 07:39 |
| duflu | Hi Trevinho | 07:39 |
| didrocks | hey Trevinho | 07:41 |
| seb128 | Trevinho, Buongiorno | 07:42 |
| oSoMoN | merci didrocks | 07:52 |
| didrocks | de rien ;) | 07:52 |
| oSoMoN | hey duflu, Trevinho, seb128 | 07:52 |
| seb128 | lut oSoMoN, en forme ? | 07:52 |
| seb128 | (and brb, changing location) | 07:53 |
| Trevinho | seb128, didrocks Bonjour | 08:00 |
| Trevinho | Et oSoMoN | 08:01 |
| Trevinho | Hi duflu | 08:01 |
| Laney | vatz up | 08:01 |
| didrocks | hey Laney | 08:02 |
| duflu | Hi Laney | 08:03 |
| duflu | i tink datz all vatz up | 08:03 |
| seb128 | hoi | 08:18 |
| seb128 | I guess Laney arrived while I was moving, hey Laney :) | 08:18 |
| Laney | hey seb128 (didrocks & duflu) | 08:18 |
| didrocks | hum, new meson doesn't like the symlinks on g-i-s.desktop: https://launchpadlibrarian.net/379093344/buildlog_ubuntu-cosmic-amd64.ubuntu-settings_18.10_BUILDING.txt.gz | 10:06 |
| didrocks | confirming it's 0.47 introducing this regression | 10:11 |
| doko | could somebody look at https://launchpadlibrarian.net/379210467/buildlog_ubuntu-cosmic-i386.goffice_0.10.41-1_BUILDING.txt.gz ? blocks a few packages | 10:23 |
| Trevinho | Laney: ciao amico! | 10:23 |
| didrocks | https://github.com/mesonbuild/meson/issues/3914 | 10:24 |
| gitlab-bot | mesonbuild issue 3914 in meson "Symlinks can't be copied by install_subdir() since 0.47.0" (comments: 0) [Open] | 10:24 |
| doko | same on debian | 10:24 |
| Trevinho | Laney: as for the upstream tags thing I was asking few days ago... I think csoriano might make a release for nautilus today... if he does, that would be a case where if I import the orig in ubuntu first (and then debian does), would cause some troubles, no? Well, in this case probably it's just better to ask you to merge my PR for the pristine-tar in debian and then going with ubuntu, but well... what would be better? :) | 10:26 |
| didrocks | ahah, the code has a "# FIXME: what about symlinks?" | 10:26 |
| didrocks | for meson | 10:26 |
| didrocks | yeah, "thx" ;) | 10:26 |
| Laney | Trevinho: just propose the upstream stuff to salsa | 10:27 |
| Trevinho | that's fine, I only need to have you around :) | 10:27 |
| Laney | one day you can get access there | 10:27 |
| Trevinho | if it involves bureaucracy probably not :-D | 10:28 |
| Laney | less than getting gnome commit rights | 10:28 |
| Laney | doko: not sure what that has to do with this channel? | 10:29 |
| Trevinho | Laney: for me that one was really easy... I said can I have push access? Done. :D | 10:31 |
| Laney | O_O | 10:31 |
| Laney | well then it's the same | 10:31 |
| Trevinho | good new point releases for mutter and shell ready... | 10:32 |
| * Trevinho prepares branches | 10:32 | |
| Laney | these people skipping the process | 10:32 |
| Laney | RULES | 10:32 |
| Laney | I LOVE RULES | 10:32 |
| Trevinho | Cages you love cages! | 10:33 |
| Trevinho | I put rules, I don't respect them though... Classic italian way :-D | 10:33 |
| Laney | (ERROR: ERROR:../../../../../testsuite/gtk/defaultvalue.c:45:check_property: Property GtkFontChooserWidget.tweak-action: NULL != ((GSimpleAction*) 0x5619ca8c6800) | 10:34 |
| Laney | now what is this trying to tell me | 10:34 |
| * Laney finds the commit that fixes that | 11:06 | |
| Trevinho | Laney: https://salsa.debian.org/gnome-team/mutter/merge_requests/3 and https://salsa.debian.org/gnome-team/gnome-shell/merge_requests/2 | 11:28 |
| gitlab-bot | GNOME issue (Merge request) 3 in mutter "New upstream release 3.28.3" (comments: 0) [Opened] | 11:28 |
| gitlab-bot | GNOME issue (Merge request) 2 in gnome-shell "New upstream release 3.28.3" (comments: 0) [Opened] | 11:28 |
| Laney | yeah, it emails me | 11:28 |
| Laney | are you going to do the debian/master bits too? | 11:28 |
| Trevinho | since I was there... altough... I'm seeing something weird in the diffs :o | 11:29 |
| Trevinho | Laney: as updating pristine-tar only would involve passing an upstream/x.y.z tag or i could use the actual x.y.z tag from upstream only? | 11:31 |
| Trevinho | I mean gitlab shows also debian/* files which I didn't touch as changes, while local git diff salsa/debian/master doesnt | 11:33 |
| * Trevinho updates ubuntu too (time to create a branch for mutter ubuntu/bionic I guess, as I wanted that anyway) | 11:35 | |
| Laney | what changes are needed there over cosmic? | 11:36 |
| Trevinho | Laney: nothing, but to track at least the changelog and stuff... And not to have to deal with debdiffs :-P | 11:40 |
| Trevinho | and we eventually we'll need one anyway, so... | 11:40 |
| Trevinho | technically we've already forked (as if just for changelog) | 11:40 |
| Trevinho | in any case, in this scenario without having g-s on salsa to have the upstream/foo tag udpating also ubuntu g-s would be problematic I guess, as if debian wouldn't want to update (for example) we'd ended up in redefining a new upstream/version tag which then debian will overwrite... If cases like this would happen (hypotetically now), wouldn't be just better to use a different upstream tagging option? (like upstream-ubuntu/version) | 11:45 |
| Laney | I'd rather we stop coming up with problems that don't exist yet | 11:45 |
| seb128 | what's the issue? us updating before Debian? | 11:49 |
| seb128 | there is no reason the pristine-tar/gnome content should be different even if we do update on our side and they do it later on their right? like merging should just work, and the tags are different since the versions are different? | 11:50 |
| Trevinho | seb128: yes, that case... | 11:51 |
| Trevinho | the upstream tags will be different | 11:51 |
| Laney | I can't be bothered to fight over these details every day | 11:52 |
| Laney | so I just go with whatever you propose | 11:52 |
| Trevinho | so when you import the origin, as per our gbp.conf we get upstream/x.y.z tag, while debian might have the same later | 11:52 |
| seb128 | ah | 11:52 |
| seb128 | what do you propose to do for those cases? | 11:52 |
| Trevinho | 😂 win for stressing :-D | 11:52 |
| Trevinho | Well, I though that in such cases we could change the debian/gbp.conf to use something like upstream-ubuntu/x.y.z tagging then, when we merge back get it back to upstream/foo | 11:53 |
| Trevinho | not that is a solution I like, but it's the only one that comes up to my mind not to have to have clashing tags | 11:54 |
| Trevinho | anyway Laney in this case just merge and I'm happy :-P | 11:54 |
| Trevinho | but there will be cases, I know, when we can't proceed this way | 11:55 |
| seb128 | Trevinho, https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1718931 has been fixed in g-s 3.28.3 if you want to list it in the changelog | 11:56 |
| ubot5 | Ubuntu bug 1718931 in gnome-shell (Ubuntu) "No VPN autoconnect" [High,In progress] | 11:56 |
| Trevinho | seb128: yeah, also others thanks... but I've not prepared the g-s for ubuntu yet as I'm not sure if I can reuse the tag I just done for upstream until it gets merged to debian | 11:56 |
| Trevinho | (to merge with that) | 11:57 |
| seb128 | k, well that discussion is a bit over me and I feel like it's a sensitive topic for Laney and I don't want to piss off anyone so I'm going to step out and let you guys deal with it | 12:01 |
| seb128 | just "we can't update because Debian didn't update yet" isn't an answer, how we get the update I don't care about | 12:01 |
| seb128 | either by doing ourself in Debian, doing it first and dealing with tags issues or whatever you guys prefer | 12:02 |
| Trevinho | I've not actually any strong opinion in how | 12:02 |
| Trevinho | I only want to know how... | 12:02 |
| seb128 | just pick one and go with it then | 12:02 |
| seb128 | seems nobody is going to tell you that | 12:02 |
| seb128 | both Laney and I bailed out from replying to that question | 12:03 |
| Trevinho | eh, but I don't want to go back later, so I ask | 12:03 |
| seb128 | so do what you think makes sense | 12:03 |
| Laney | what is the actual problem that happens rather than a theoretical concern? | 12:03 |
| seb128 | and if someone disagrees with what you did we can discuss | 12:03 |
| seb128 | Laney, from what I understood Trevinho thinks we are going to have the upstream/3.28.3 tag on a different commit than Debian | 12:03 |
| seb128 | unsure if that's a problem? | 12:04 |
| Laney | I understand that | 12:04 |
| Laney | I don't understand what the real problem that happens as a result is | 12:04 |
| Trevinho | Well, now might not be the case, as I've prepared the branches | 12:04 |
| Laney | seems like guessing / assumption to me | 12:04 |
| seb128 | I don't understand git enough | 12:04 |
| seb128 | can the same tag be defined twice? | 12:04 |
| seb128 | or can we diverge? | 12:04 |
| Laney | no, but does it even matter? | 12:04 |
| seb128 | or what tags mean | 12:04 |
| Laney | you merge the commit into the packaging branch | 12:04 |
| Laney | then it has multiple parents | 12:04 |
| Trevinho | but.... imagine we want to switch to any package first than debian... as for some reaason they want to stick to older version | 12:04 |
| Laney | even if one of them isn't named as a tagged revision | 12:04 |
| Laney | so does it really actually matter if you don't have the tags at all? | 12:05 |
| Laney | I think this is guesswork and nobody has actually tried it to see what the problem is | 12:05 |
| seb128 | k, as I said I don't understand git enough to understand what consequences a mismatch is the tagging has | 12:05 |
| Trevinho | I can merge with actual upstream branch and that's fine... | 12:06 |
| Laney | I'm happy to talk about *real* problems | 12:06 |
| seb128 | but yeah, I'm fine ignoring the issue until it creates a problem in practice, then we can fix if needed | 12:06 |
| Laney | that have *actually* happened | 12:06 |
| Laney | but discussing abstract things, not so much | 12:06 |
| Trevinho | but the fact is that if you don't have the upstream-tag set, gbp complains no? | 12:06 |
| seb128 | Trevinho, import-orig would tag upstream no? | 12:06 |
| Trevinho | Laney: I need you more philosopher :) | 12:06 |
| Trevinho | seb128: eh, yes... but we can't do that or that tag will be on debian too later.. .so | 12:07 |
| seb128 | Laney, fine, but if we *know* that we are doing something stupid that is going to blow up we might as well discuss how to fix it before it bites us ... which from the backlog I now understand it doesn"t seem to be the case there and we don't know if it would create any problem | 12:07 |
| Trevinho | this is the case where instead of using import-orig, you actually git merge with origin / branch | 12:07 |
| seb128 | so yeah, let's stop arguing and just do the work then | 12:07 |
| Laney | seb128: yes, so if you think there's a problem | 12:07 |
| Laney | then demonstrate that it exists | 12:07 |
| seb128 | agreed | 12:08 |
| Trevinho | Laney: I think we already had a clashing tag issue... | 12:08 |
| seb128 | Trevinho, ^ let's get the tag first and see what it leads to when debian does the update | 12:08 |
| seb128 | Trevinho, what was the impact? | 12:08 |
| seb128 | if that's "none visible" let's not care? | 12:08 |
| Laney | you still have a reference to the commit, even if you don't have the tag by name | 12:08 |
| Laney | so the problem would only be if gbp is trying to use it by name and it ends up being different and that breaks | 12:09 |
| Trevinho | yeah, that's fine... but we'll have 2 new upstream release tag.. and at that point we've to --delete our tag, and keep debian? | 12:09 |
| seb128 | or we don't care | 12:09 |
| seb128 | that tag exists twice | 12:09 |
| seb128 | and? | 12:09 |
| Trevinho | in our repo will be different than salsa | 12:09 |
| seb128 | and? | 12:09 |
| Trevinho | or we just at that point --force push the new tag | 12:09 |
| Trevinho | to point to debian | 12:09 |
| Laney | if that happens we'll have a diverged upstream branch anyway | 12:10 |
| Trevinho | that's ok, nothing really hurting to me, but since I thought we didn't want to play with force or anything, I thought it was just saner to use our upstream tagging if we do upstream code before or different from debian, and then go back when we merge again | 12:11 |
| Laney | what I really want to avoid is making this thing really complicated | 12:11 |
| Laney | so I'm pushing back against adding more weird steps | 12:12 |
| Laney | now if something breaks, fine, we can't avoid it | 12:12 |
| Laney | but if it's no problem in reality then I would rather not make it harder | 12:12 |
| Trevinho | I see the point, I just expect that simplifying this could make things harder to fix | 12:12 |
| Trevinho | but I like to think in advance | 12:13 |
| Laney | that's fine | 12:13 |
| Trevinho | (only in computer stuff, not really in life :D) | 12:13 |
| Laney | but you can go experiment if you want to and find out what actually happens | 12:13 |
| Laney | go gbp import something in two repositories and play with merging between them | 12:14 |
| Trevinho | Laney: if would be possible to only push the upstream/{latest,foo} branches in salsa in case, is just enough though | 12:14 |
| Trevinho | as they will anyway need those | 12:14 |
| Laney | it is fine | 12:14 |
| Laney | it's always fine to push upstream and pristine-tar | 12:14 |
| Trevinho | and then they just merge when needed instead of using import-orig | 12:14 |
| Laney | those are objective things | 12:14 |
| Trevinho | ok, so let's define this rule... Propose any changes to `upstream/xxxx` branches and to `pristine-tar` always mandatory to be proposed to salsa too | 12:15 |
| Trevinho | not sure it simplifies (for who has no salsa write access) but at least, does the job | 12:15 |
| Trevinho | speaking of which Laney please pull there my ones for mutter and shell 💋 | 12:16 |
| Trevinho | (debian/master are done too, but... I can wait) | 12:16 |
| Laney | I will, don't stress | 12:16 |
| Laney | trying to get a build of gtk 3.23 | 12:17 |
| seb128 | Trevinho, the less work is to do the update in Debian and just sync/merge from them, that systems is working for Laney's goal to have us doing the work there :) | 12:18 |
| Trevinho | ahaha, yeah... :) | 12:18 |
| Laney | 😎 | 12:18 |
| Trevinho | well, that's fine for me, and I agree in doing it. Well `debian/master` is another thing, so not sure I'll always do that :-D | 12:18 |
| seb128 | I'm fine doing the work in Debian, I'm unsure how I feel about pushing/uploading things without testing them on the target distro though | 12:19 |
| seb128 | but I guess we can push without the tagging/upload that's most of the work | 12:19 |
| Trevinho | well, if you only push upstream and pristine-tar branches you don't affect them | 12:19 |
| seb128 | right | 12:19 |
| Trevinho | and that's safe | 12:19 |
| seb128 | but I mean for quite some package we have no diff | 12:19 |
| seb128 | so it would make sense to update in Debian and direct sync | 12:19 |
| Trevinho | ah, sure | 12:19 |
| Trevinho | like we do for mutter right now | 12:20 |
| seb128 | but then do you test that build on cosmic and assume it's working on Debian? | 12:20 |
| seb128 | I don't like much assuming it's fine | 12:20 |
| Trevinho | ah, indeed | 12:20 |
| Laney | no I run the things | 12:20 |
| seb128 | but I don't have enough installs to be using Debian | 12:20 |
| seb128 | already having Ubuntu current, current stable, LTS | 12:20 |
| Trevinho | yeah, it's quite a lot of chroots | 12:20 |
| seb128 | you can fire a VM and do a "log in, it works, ship" | 12:20 |
| seb128 | it's a bit of work and not proper testing though | 12:20 |
| Laney | what do you do for testing for cosmic? | 12:21 |
| seb128 | I usually boot the version of Ubuntu I'm currently working on | 12:21 |
| Trevinho | it's fine to break debian.... It's the purpose of "sid" :) | 12:21 |
| seb128 | e.g the days I do cosmic update I boot that | 12:21 |
| seb128 | the days I work on SRUs I boot my bionic disk/partition | 12:22 |
| seb128 | but I already reboot too much to my taste | 12:22 |
| Laney | but it's probably mostly testing along those same lines? | 12:22 |
| seb128 | I don't want a 3rd Debian install | 12:22 |
| Laney | install it, play a bit, ship it | 12:22 |
| seb128 | well I'm usually doing full days | 12:22 |
| seb128 | so I dput mid-day after having used a bit the session | 12:22 |
| seb128 | but yeah, no perfect system | 12:23 |
| seb128 | it's just more complicated to target several distributions/series | 12:23 |
| seb128 | and the more you add the more complex it gets | 12:23 |
| Trevinho | well, in any case I'm quite sure if there are not huge packaging changes if it works in cosmic, works in debian | 12:23 |
| seb128 | no magical way around it sadly | 12:23 |
| Laney | ok, well, as you wish | 12:23 |
| Laney | there's no new argument here | 12:23 |
| Laney | either you want to do some work to make it happen in debian, and then nobody has to duplicate the packaging work | 12:24 |
| Trevinho | In any case, I'm fine to work on debian as much we can... | 12:24 |
| Laney | or not, and someone does, but maybe a higher chance someone catches a bug | 12:24 |
| seb128 | Trevinho, yeah, that makes sense | 12:24 |
| seb128 | for apps I'm confident enough | 12:24 |
| Trevinho | In fact... for gnome-shell I already had some sync-with-debian work done that I should prepare for cosmic | 12:25 |
| seb128 | not likely to behave differently between distros and not the end of the world if there is an issue in the image viewer | 12:25 |
| seb128 | but the shell is a bit trickier | 12:25 |
| Trevinho | although we still have our patches, but at least rebase on that | 12:25 |
| Trevinho | for mutter is fine, although I'd like some more freedom, but normally we add to it only stuff that is anyway proposed to upstream, so even debian guys are fine normally | 12:26 |
| Laney | people can do what they think is best | 12:27 |
| Trevinho | that said, I'm going to update g-s on ubuntu... Using my tag. :) | 12:27 |
| Laney | it's been this way for years with only a couple of us doing the updates on the debian side | 12:27 |
| Laney | not going to destabilise anything if this doesn't change | 12:27 |
| Trevinho | I like to propose things there, I just don't want to slow down even more the work... as you know, I already I've to pass through the desktop sponsor, later will be debian sponsor + sync. I'm ok to do it, but indeed slows things down a bit (especially if you have to reiterate) | 12:28 |
| Trevinho | but since all this git thing happened, working with both debian and ubuntu and upstream is a looooooot more easier and productive | 12:29 |
| Trevinho | so happy to put more bits at the very source | 12:29 |
| Trevinho | seb128: for nautilus.. our MPs are approved, let me know if you want to wait a bit more (i'd say eod) for rebase this on next upstream release if Carlos can do it, or we can proceed with these | 12:31 |
| Trevinho | seb128: ah, also for bionic maybe I should use different different versioning? | 12:34 |
| Trevinho | like 0ubuntu0? | 12:34 |
| fossfreedom__ | Hi all - I have a patch/SRU request outstanding for the last couple of months - anyone got a bit of time to sponsor it? https://bugs.launchpad.net/ubuntu/+source/gnome-menus/+bug/1765799 | 12:35 |
| ubot5 | Ubuntu bug 1765799 in gnome-menus (Ubuntu) "Applications menu does not get populated with recently installed apps using apt" [Medium,New] | 12:35 |
| Trevinho | fossfreedom__: can you propose a MP against https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-menus/+git/gnome-menus ? :) | 12:37 |
| fossfreedom__ | Trevinho: sure ... any instructions available on how this is now done with the new launchpad git system? | 12:39 |
| Trevinho | fossfreedom__: https://wiki.ubuntu.com/DesktopTeam/git | 12:39 |
| seb128 | Trevinho, right, nautilus is on my todo for today, morning was a bit busy but I do that in a bit | 12:40 |
| Trevinho | so gbp clone that repo, gbp pq import add your patch (in this case you can use git apply probably), then, gbp pq export, edit changelog, stage changes (avoid committing index updates, if not in a different commit) | 12:41 |
| seb128 | Trevinho, versioning, https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging | 12:41 |
| Trevinho | oh, that's the wiki I was looking for, thanks | 12:41 |
| seb128 | fossfreedom__, sorry about this one, I though jbicha would handle it/I wanted to talk to him since he's the one who introduced the bug, but I was busy and he vanished then | 12:42 |
| Trevinho | seb128: as for version for SRU (before you review it), should be 3.26.3.1-0ubuntu0.18.04.1 then | 12:43 |
| seb128 | fossfreedom__, I've already too much on my todo for today and I'm having a day off tomorrow but I have a look next week for sure if nobody beats me, if you get a git mr up by then it should be all good :) | 12:43 |
| Trevinho | while for mutter we used the ~ubuntu18.04.1 way | 12:43 |
| Trevinho | (i like that more I think :P) | 12:43 |
| Trevinho | not sure then | 12:43 |
| seb128 | Trevinho, sounds like it ... I had a case of where I used ~18.04 recently which was rejected and reupload by the SRU team with another version, depends who is reviewing it | 12:44 |
| Trevinho | k | 12:44 |
| seb128 | but yeah, ~serie is right as well | 12:44 |
| fossfreedom__ | seb128: ta. Will try to get my head around this. I'm used to the github fork and graphical merge process - this launchpad method looks nothing like that. | 12:52 |
| seb128 | fossfreedom__, well, it's basically "push to git, click on the submit merge request button" similar to what you did with bzr in launchpad | 12:53 |
| seb128 | just the vcs commands changing and the url in launchpad to get/push/browse | 12:53 |
| fossfreedom__ | ah - in that case, more happy | 12:54 |
| Trevinho | seb128: things for loving git even more https://stackoverflow.com/a/44754855/210151 :-D | 13:10 |
| Trevinho | I was trying with `git show --theirs` but, noooo... | 13:10 |
| seb128 | lol | 13:11 |
| Trevinho | 1, 2, 3... easy :) | 13:12 |
| * Trevinho wonders how to alias these | 13:12 | |
| Laney | I was just having a git rage that it was telling me my branch was up to date when trying to merge with debian | 13:13 |
| Laney | ...I was typing the wrong branch name | 13:14 |
| Laney | 😭 | 13:14 |
| willcooke | sigh | 13:29 |
| * willcooke needs new glasses | 13:29 | |
| willcooke | I shouldnt have got a laptop with a 1080 13" screen | 13:29 |
| * willcooke <-- old | 13:30 | |
| * Laney nelson laugh | 13:39 | |
| Trevinho | Laney: I love raging laney :-D | 13:48 |
| Laney | ;_; | 13:49 |
| Laney | ahhhhhhhhhhhhhhhhhhhhh | 13:54 |
| Laney | a new gtk 3.23 release just as I was about to do the other one | 13:54 |
| Laney | new release, new testsuite failures /o\ | 13:54 |
| * didrocks reboots with gdm debug log on | 13:58 | |
| didrocks | gdm doesn't find a session in /usr/local | 13:58 |
| * czajkowski passes Laney a 99 to cool on down :) | 14:13 | |
| Laney | yessss | 14:13 |
| Laney | 🍦 | 14:13 |
| Laney | that would be good actually, this room is currently 27.7C | 14:13 |
| didrocks | ok, so: | 14:18 |
| didrocks | 1. GDM doesn't have /usr/local in its env var, that's why I think it's not picking up things in /usr/local | 14:18 |
| didrocks | 2. GNOME Shell doesn't like mode names with upper letters | 14:19 |
| * didrocks will file moar bugs today | 14:19 | |
| Trevinho | didrocks, Laney, seb128: I've updated this section https://wiki.ubuntu.com/DesktopTeam/git#Merge_a_new_upstream_version including the thing we discussed earlier about push-back to salsa the pristine-tar/upstream branches changes, how to proceed if the tag is already there and how to deal with rebasing patches | 14:23 |
| Trevinho | didrocks: you can pass XDG env to gdm now, not in 3.28 though | 14:24 |
| Trevinho | I fixed that as I needed it to get gdm working from jhbuild | 14:24 |
| didrocks | Trevinho: yeah, my issue is bionic | 14:27 |
| Trevinho | didrocks: eh, there's a patch to cherry-pick if you want | 14:27 |
| Trevinho | :) | 14:27 |
| didrocks | Trevinho: unsure it worthes it right now, but we'll see. At least, no need to open a bug on that one :) | 14:28 |
| didrocks | a last reboot, hopefully :) | 14:33 |
| Trevinho | mh, when gnome-shell was pushed to ~ubuntu-desktop, the tags where not pushed... | 14:42 |
| Trevinho | also the release is missing a tag... | 14:43 |
| Trevinho | while ubuntu/3.28.2-0ubuntu1 is wrong... | 14:45 |
| Trevinho | didrocks: we miss tags on gnome-shell, could you push and pull them from my remote? | 15:00 |
| Trevinho | err pull and push :-P | 15:00 |
| Trevinho | and actually before pushing fix ubuntu/3.28.2-0ubuntu1 as that should be for 65d8e54e48028903b626117d6f19a4aab42353fa (current git head) | 15:04 |
| didrocks | Trevinho: who did push your g-s word and why did we miss tags? | 15:04 |
| Trevinho | cause tags were not pushed I guess | 15:04 |
| didrocks | I don't remember, is it me transforming the branch? | 15:04 |
| Trevinho | might be, if you didn't just changed ownership from lp ui that might have happened | 15:05 |
| didrocks | Trevinho: ah, you did the transform | 15:05 |
| Trevinho | not an issue, although I think I deleted the ~canonical-deskop-team branch so... let me seee | 15:05 |
| didrocks | Trevinho: and I confirm I don't have the tags locally, so you didn't push them in your script :p | 15:05 |
| Trevinho | no, no I pushed... they are in my remote | 15:05 |
| didrocks | well, remote from when? ;) | 15:05 |
| Trevinho | and same in the all the other canonical remotes, so... should be there | 15:06 |
| didrocks | can you give me the remote url so that I don't have to search for it and just push the tags? | 15:06 |
| Trevinho | lp:~3v1n0/ubuntu/+source/gnome-shell | 15:06 |
| didrocks | thx! | 15:06 |
| Trevinho | let me check though as that should be a bit different now, but just try to get tags from that and see if they apply | 15:06 |
| Trevinho | plus you nee to git tag the desktop-team heaad with ubuntu/3.28.2-0ubuntu1 | 15:07 |
| didrocks | Already up to date. | 15:07 |
| didrocks | hum, how do we fetch the tags only? | 15:07 |
| Trevinho | git fetch --tags | 15:08 |
| didrocks | argh, missing s :/ | 15:08 |
| Trevinho | but actually these two branches might be a bit different, so let see if they apply, otherwise I need to go manual way | 15:08 |
| didrocks | actually, the tag ubuntu/3.28.2-0ubuntu1 already exits | 15:08 |
| didrocks | but on a commit you unreferenced | 15:08 |
| Trevinho | yeah, but it's wrong | 15:08 |
| Trevinho | yep | 15:09 |
| didrocks | why would it be different, you changed it again? :/ | 15:09 |
| Trevinho | no, I think we messed up things, as it was in the ~canonical-desktop-team and I removed the repo probably, while you imported from lp:~3v1n0 so they were different I think | 15:10 |
| didrocks | anyway, I just retag tip with ubuntu/3.28.2-0ubuntu1, deleting the old one | 15:10 |
| Trevinho | yeah, need to do that | 15:10 |
| didrocks | and yeah, I can't push because of tag conflicts | 15:10 |
| didrocks | so -f? :/ | 15:11 |
| Trevinho | also a36941c3b739d907eeaf8a17bd73e7dca5988ab7 should be ubuntu/3.28.1-0ubuntu2-bzr to match old behavior | 15:11 |
| Trevinho | you can push -f on tag or | 15:11 |
| didrocks | it's 65d8e54e48028903b626117d6f19a4aab42353fa | 15:11 |
| Trevinho | push --delete tag and then push again | 15:11 |
| didrocks | which is tip | 15:11 |
| didrocks | yeah, but people already having the branch would have conflicts | 15:11 |
| didrocks | anyway… I'll tell them to talk to you, I don't want to waste more time on this :p | 15:11 |
| didrocks | the other tags were already on the remote | 15:12 |
| didrocks | it's only the commit you tweaked which wasn't | 15:12 |
| seb128 | andyrock, hey, I uploaded bug #1781996 to cosmic and bionic, unsure if you have a better testcase than watching error reports, if you do please update the bug info :) | 15:13 |
| ubot5 | bug 1781996 in gnome-software (Ubuntu) "/usr/bin/gnome-software:11:g_date_time_to_instant:g_date_time_to_unix:gs_plugin_refine_app:gs_plugin_loader_call_vfunc:gs_plugin_loader_run_refine_filter" [Medium,Fix committed] https://launchpad.net/bugs/1781996 | 15:13 |
| didrocks | Trevinho: so, everything should be pushed | 15:13 |
| seb128 | Trevinho, I'm sorry but I didn't manage to look at nautilus today and I need to call it a day early, going to France for the w.E and having tomorrow off | 15:13 |
| Trevinho | didrocks: tags aren't here https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell/refs/ | 15:13 |
| seb128 | but I might do an hour or so in the morning tomorrow and look at it then | 15:13 |
| didrocks | ubuntu/3.28.1-0ubuntu2 | 15:14 |
| didrocks | ubuntu/3.28.2-0ubuntu0.18.04.1 | 15:14 |
| Trevinho | seb128: mh, ok... carlos will do a release soon though, so i'll rebase on it | 15:14 |
| didrocks | ubuntu/3.28.2-0ubuntu1 | 15:14 |
| didrocks | $ git push --tags | 15:14 |
| didrocks | Everything up-to-date | 15:14 |
| Trevinho | didrocks: the old ones I mean | 15:14 |
| Trevinho | mhmhmh | 15:14 |
| Trevinho | ah, wait I've them locally | 15:14 |
| didrocks | :/ | 15:14 |
| didrocks | seriously… | 15:14 |
| Trevinho | not sure, I pulled them from remote before | 15:14 |
| Trevinho | https://www.irccloud.com/pastebin/CBzR5rhA/ | 15:14 |
| Trevinho | So they should be no remote | 15:15 |
| Trevinho | didrocks: ahhhhhhhhhhh | 15:15 |
| Trevinho | need to od this | 15:15 |
| Trevinho | what git tag -l 'ubuntu/*' points to you? | 15:15 |
| seb128 | Trevinho, well, let's see tomorrow | 15:15 |
| seb128 | maybe the delay is helping in that regard :) | 15:16 |
| Trevinho | seb128: I'll prepare everything tonight if he gets it ready | 15:16 |
| seb128 | thx | 15:16 |
| didrocks | Trevinho: the 3 commits I gave ^ that's what I wrote | 15:16 |
| Trevinho | didrocks: this is weird... why when I fetched from my remote I had the tags there, while you didn't? :o | 15:18 |
| didrocks | Trevinho: I just refetched again from your repo, and this time I got 50Mg + the tags… :/ | 15:19 |
| Trevinho | mh and I didn't push nothing | 15:19 |
| didrocks | launchpad snaffu? | 15:19 |
| didrocks | I'm repushing your tags and content | 15:19 |
| Trevinho | only tags | 15:20 |
| didrocks | well, git push --tags do both | 15:20 |
| Trevinho | mhmhm wait then :) | 15:20 |
| didrocks | too late | 15:20 |
| didrocks | but errored out | 15:20 |
| didrocks | because of tag conflicts | 15:20 |
| Trevinho | soooo... this | 15:21 |
| Trevinho | git tag | grep -E '^ubuntu/|^debian/|^upstream/' | xargs --no-run-if-empty git push origin --force | 15:21 |
| Trevinho | this will only push tags | 15:21 |
| didrocks | Everything up-to-date | 15:22 |
| Trevinho | ack | 15:22 |
| Trevinho | as for content, good that it didn't update | 15:22 |
| didrocks | it did | 15:22 |
| didrocks | I think it only errored out on the tip tag | 15:22 |
| didrocks | which isn't part of the transaction | 15:22 |
| didrocks | so your 60M or so are now in the ~ubuntu-desktop branch | 15:22 |
| Trevinho | lovely data | 15:23 |
| Trevinho | well I would have only pushed the tags as before, reducing a bit the things, but... | 15:23 |
| didrocks | ok, so I need to fix manually the tip tag | 15:23 |
| Trevinho | could you tag also a36941c3b739d907eeaf8a17bd73e7dca5988ab7 as ubuntu/3.28.1-0ubuntu2-bzr for consistency | 15:23 |
| Trevinho | ? | 15:23 |
| Trevinho | gnome-shell wasn't done with the script, so... it's different from others. Or well was scripted, but later :) | 15:24 |
| * didrocks would love to not spend time on this and has real work to do :/ | 15:24 | |
| didrocks | let me fix those 2 tags | 15:24 |
| didrocks | I hope it's the last time we complexify something this way | 15:24 |
| Trevinho | I know, it's only few minutes, then I'll bother you only for pulling new upstream version :-D | 15:24 |
| didrocks | check with others maybe? ;) | 15:25 |
| Trevinho | eh, basically I made laney already crazy enough, I need to go back to you a bit :-D | 15:25 |
| seb128 | or to stop making people crazy? | 15:26 |
| seb128 | that is way more discussions and issues that it should have been :/ | 15:26 |
| seb128 | #fail | 15:26 |
| didrocks | * [new tag] ubuntu/3.28.1-0ubuntu1 -> ubuntu/3.28.1-0ubuntu1 | 15:27 |
| didrocks | * [new tag] ubuntu/3.28.1-0ubuntu2-bzr -> ubuntu/3.28.1-0ubuntu2-bzr | 15:27 |
| didrocks | done | 15:27 |
| Trevinho | seb128: not possible, since I've not push rights in nor salsa or our git... | 15:27 |
| Trevinho | didrocks: thanks, I should be able to proceed with new push now | 15:34 |
| didrocks | yw! | 15:35 |
| Trevinho | and... When you've time maybe you can pull push again without interruptions, please :) | 15:37 |
| didrocks | git fetch -> nothing to do… | 15:38 |
| didrocks | from your repo | 15:38 |
| didrocks | ah --tags | 15:39 |
| didrocks | please be explicit | 15:39 |
| didrocks | again on ubuntu/3.28.2-0ubuntu1? | 15:39 |
| didrocks | ok, git push -f --tags and done | 15:39 |
| Trevinho | mh it was still pushing, weird since most of things should be already there but it takes a bit, I'll write when is finishing for real -_- | 15:44 |
| Trevinho | ok it's done... I've not finalized the relase though, as someone should sponsor that anyway... let me know if i can do that | 15:47 |
| didrocks | Trevinho: pushed, and yes, please wait for things to be pushed before pinging | 15:52 |
| didrocks | Trevinho: you only pushed ubuntu/master | 15:58 |
| didrocks | not pristine-tar | 15:58 |
| didrocks | nor upstream/latest | 15:58 |
| didrocks | please follow the wiki :/ | 15:59 |
| didrocks | it does say it explicitely when upgrading a new release | 15:59 |
| Trevinho | didrocks: these are to be taken from salsa, which is not ready yet... | 15:59 |
| Laney | just push them, it's going to be the same | 16:00 |
| Trevinho | indeed i know that, that's why I've updated the wiki also for that | 16:00 |
| didrocks | Trevinho: hum, we told we would do it ourself and merge from salsa | 16:00 |
| didrocks | that's what we discussed with Laney | 16:00 |
| Trevinho | ok | 16:00 |
| didrocks | Trevinho: please don't, revert to what it was | 16:00 |
| Laney | I'll push those now in a minute if you want | 16:00 |
| Trevinho | Laney: I think I've to redo the gnome-shell debian/master I think though | 16:00 |
| didrocks | I'll let Laney goes on from now :) | 16:00 |
| didrocks | but please don't decide on workflow changes yourself | 16:01 |
| didrocks | so, revert the wiki as it was, with what we agreed upon | 16:01 |
| Trevinho | didrocks: no, I didn't change things, we said here before... plus seb said just do... so it's hard what is a democracy and what a doacracy | 16:01 |
| didrocks | Trevinho: well, we said before with Laney that we would do it and merge back | 16:02 |
| Laney | no I'll just push to salsa | 16:02 |
| Trevinho | didrocks: check what I also changed, there are things which need to be that way (like importing orig) | 16:02 |
| Laney | don't know about this other stuff, I'm not getting involved with that right now | 16:02 |
| didrocks | Trevinho: I'm a little bit tired to check again and again random changes | 16:02 |
| didrocks | so no, I won't check, if it doesn't work and we see it yourself, you will fix them I guess | 16:02 |
| didrocks | which is fine | 16:02 |
| didrocks | but I'm out of that update for now | 16:02 |
| Trevinho | ok, I can handle changes when they will needed | 16:03 |
| didrocks | sounds like everyone is going to use a different workflow | 16:03 |
| didrocks | going to be create something interesting and messy, but we'll see | 16:03 |
| Trevinho | didrocks: nope... it's all the same, just we can't use import-orig for example when orig hsa alrady the tag | 16:03 |
| Trevinho | so, that needed to be changed | 16:04 |
| didrocks | that's was one of the point, indeed, but I hope that you didn't chagne for the case the tag wasn't here | 16:04 |
| Trevinho | Nope, I only mentioned that | 16:04 |
| didrocks | k | 16:04 |
| didrocks | anyway, enough for today, get someone to sponsor it now :) | 16:05 |
| Trevinho | and updated to mention that if the pristine-tar and upstream/* branches are updated, they need to be proposed to salsa | 16:05 |
| Laney | those are pushed now, no chance of diverging any more | 16:05 |
| didrocks | eoding, see you tomorrow guys for those who are around tomorrow :) | 16:06 |
| didrocks | friday is git-workflow-less discussion \o/ | 16:06 |
| Laney | bye didrocks! | 16:06 |
| === pstolowski is now known as pstolowski|afk | ||
| didrocks | enjoy your long week-end Laney ;) | 16:06 |
| Trevinho | Laney: now debian/master for g-s is fine | 16:31 |
| Trevinho | not sure what happened, like the patch-queue branch went into master :o | 16:31 |
| Laney | sí, looking good | 16:34 |
| Laney | at least it fast forwarded this time | 16:34 |
| Trevinho | Laney: good, as for g-s on ubuntu, not sure you've time to sponsor... in case I can finalise the changelog, and i've already pushed in my local a new changelog entry | 16:46 |
| Laney | I'm on the train, probably not but I'll see | 16:47 |
| Laney | trying to build debian now | 16:47 |
| Laney | made me notice you got some comments from Florian on gnome-shell !4 | 16:48 |
| Laney | 😜 | 16:48 |
| Trevinho | yes, I didn't address them yet since there were some bigger bits he probably wanted to change, so these where only styling related | 16:50 |
| Trevinho | Laney: where are you heading to? | 16:50 |
| Laney | south coast | 16:51 |
| Laney | need some more sea swimming | 16:51 |
| Trevinho | right, enjoy then | 16:52 |
| Trevinho | I've been swimming in awesome sea these days, so back to a city (Granada) since last night | 16:52 |
| Trevinho | git log | 16:52 |
| Trevinho | no, this is not terminal, marco! | 16:52 |
| Laney | commit d3adb33f | 16:52 |
| Laney | Author: Santa Claus | 16:53 |
| Trevinho | :) | 17:06 |
| Trevinho | I've prepared also the gnome-shell upstream branches | 17:07 |
| Trevinho | errrrrrr | 17:07 |
| Trevinho | gnome-shell bionic branches | 17:07 |
| * Trevinho need to stop :) | 17:07 | |
| Laney | oh god git rerere just saved my life | 17:42 |
| === Mirv_ is now known as Mirv | ||
| Laney | Trevinho: if you merge gnome-shell with debian/3.28.3-1 tag it'll make me happy (ubuntu/master) | 19:15 |
| Laney | and then make the changelog a merge changelog (remaining changes: stuff) | 19:16 |
| Laney | we now have new gtk 3.23 in cosmic-proposed but glib's going to have to wait because there's no tarball just yet | 19:19 |
| Laney | hope it doesn't break stuff | 19:20 |
| * Laney is going OFFLINE until tuesday | 19:20 | |
| Laney | BYE!!!! | 19:20 |
| willcooke | See ya Laney, have a good one | 19:22 |
| Trevinho | Laney: yeah I already had a branch for that, need to do it... Although for now better to wait next major, because otherwise all the merges with Ubuntu/bionic would be harder | 19:36 |
| oSoMoN | enjoy the time off Laney ! | 19:39 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!