=== zz_freyes is now known as freyes | ||
=== freyes is now known as zz_freyes | ||
=== zz_freyes is now known as freyes | ||
=== nisscream is now known as nisstyre | ||
Leviticus | !ops | nooo waaaa | 04:59 |
---|---|---|
ubottu | nooo waaaa: Help! Channel emergency! mneptok, Hobbsee, cjwatson, mdz, lamont, Keybuk, or thom! | 04:59 |
goodwill | eh? | 05:22 |
rww | just a troll. | 05:30 |
=== freyes is now known as zz_freyes | ||
gr33n-ion | hello | 06:51 |
Noskcaj | hey gr33n-ion | 07:03 |
gr33n-ion | sup :D | 07:16 |
bluesabre | quick question... does pushing to an ubuntu branch result in an upload as well? | 12:05 |
bluesabre | always been unclear about that | 12:05 |
hjd | cjwatson: Hello again. I saw that you synced cl-fad yesterday, would you mind doing the same for cl-interpol? (Would probably resolve the ftbfs issue for pgloader) :) | 14:57 |
=== davmor2_ is now known as davmor2 | ||
cjwatson | hjd: I'll sort it out tomorrow. Requires a fakesync so didn't get caught in my initial pass. | 17:21 |
cjwatson | (.orig has changed from the contents that the Ubuntu archive remembers from an earlier incarnation) | 17:21 |
teward | is there a list of packages which are automatically synced for vivid? | 17:31 |
tumbleweed | teward: all packages, except the ones that are blacklisted | 17:33 |
teward | tumbleweed: do you have a list of blacklisted packages, somewhere? | 17:33 |
tumbleweed | http://people.canonical.com/~ubuntu-archive/sync-blacklist.txt | 17:33 |
teward | tumbleweed: OK, one last question - we have a modified package here in Ubuntu, nginx, which has one built binary which is in Main. A sync would really need to be a merge, so how does the auto sync interpret that? | 17:35 |
teward | does it just sync and its up to the devs to just reapply the changes that're needed to be kept, or does that need a manual merge | 17:35 |
tumbleweed | packages are only synced when they aren't modified in ubuntu | 17:36 |
tumbleweed | merges are done by hand | 17:36 |
teward | so I'd ahve to request a merge... figures. | 17:36 |
tumbleweed | usually the last person to touch it does the merge, because they know what changes they made | 17:37 |
cjwatson | If you want to look at the full logic, it's in the auto-sync script in lp:ubuntu-archive-tools | 17:38 |
teward | tumbleweed: right, well, in theory, the last person to touch it was me, but if you want to be really anal about it, the last person to touch the package was mdeslaur | 17:40 |
teward | because marc just sponsored a last-minute change for the nginx package. | 17:40 |
teward | (which was to somewhat-mitigate POODLE) | 17:40 |
teward | so should I be poking mdeslaur to do the merge? | 17:40 |
tumbleweed | no, you're the one on the hook, not him :) | 17:41 |
teward | tumbleweed: insomuchthat marc has upload rights and I don't. | 17:42 |
teward | any merge I do has to be sponsored. | 17:42 |
teward | guess i should dig up my 'how to effectively merge' guide | 17:43 |
tumbleweed | yep | 17:44 |
hjd | cjwatson: ok. Thanks. | 17:49 |
teward | tumbleweed: any kind of guidance on how to perform a merge? | 18:26 |
teward | if i have followed http://packaging.ubuntu.com/html/udd-merging.html for creating a merge for a package, where should I push the resulting modifications to? What is the pattern I should use for uploading this to launchpad? (I'm used to the traditional debdiff methods :/) | 19:14 |
tumbleweed | teward: you read https://wiki.ubuntu.com/UbuntuDevelopment/Merging ? | 19:15 |
tumbleweed | ah, you read the udd docs | 19:15 |
teward | tumbleweed: MOM failed | 19:15 |
teward | that's why i went the UDD route | 19:15 |
tumbleweed | yes, you can push a branch and propose a merge, but those can be hard to review | 19:15 |
tumbleweed | still that's the reviewer's problem, not yours | 19:15 |
teward | tumbleweed: could I perhaps just do bzr builddeb, then gen a debdiff? | 19:16 |
teward | upload said debdiff to launchpad when i create a merge request bug? | 19:16 |
tumbleweed | failed? | 19:16 |
teward | tumbleweed: E:CouldNotFindDSC | 19:16 |
tumbleweed | yes you can | 19:16 |
tumbleweed | it all looks like it's there. I don't know where you saw that error. https://merges.ubuntu.com/n/nginx/ | 19:17 |
* teward shrugs | 19:17 | |
teward | i should use the automated reports, either way xD | 19:17 |
* teward yawns | 19:17 | |
teward | urgh, i need more coffee | 19:17 |
teward | tumbleweed: ultimately the same report was shown from the bzr/UDD method | 19:18 |
tumbleweed | :P | 19:18 |
teward | namely that the debian/ files had those same conflicts | 19:18 |
teward | which i resolved | 19:18 |
teward | tumbleweed: who do I bother for a cursory review of the debdiff, as this is the first time I've gone the UDD route for creating a merge | 19:21 |
teward | shoudl i go bug mdeslaur who merged it before? | 19:21 |
tumbleweed | if you propose a merge, it'll appear in the sponsoring overview | 19:22 |
teward | tumbleweed: thanks. QUestion: how often does the sponsorship queue page get updated | 19:45 |
tumbleweed | sorry, I can't remember | 19:59 |
ari-tczew | Laney: I'd like to take a merge on shotwell, you're the last uploader. I hope you're not angry :-) | 21:45 |
Laney | ari-tczew: go for it, happy to review also | 21:47 |
ari-tczew | Laney: ok, I'll subscribe/mark you as reviewer! :-) | 21:48 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!