[05:42] <akiva-thinkpad> is the tree my code, or is the merge-source my code?
[05:42] <akiva-thinkpad> The manual on conflict handling does not explain this well in my opinion
[05:43] <akiva-thinkpad> "This" and "Other" in my opinion, are really bad adjectives to use in describing the branches.
[06:57] <wgrant_> akiva-thinkpad: TREE/THIS is whatever was in your tree before the merge
[06:57] <wgrant_> MERGE-SOURCE/OTHER is whatever is being merged
[09:17] <sunweaver> hi!
[09:17] <sunweaver> is it possible to change my account name at Launchpad? I have been a DD for a while now, and I would love to appear under my Debian account name on Launchpad (sunweaver).
[09:18]  * sunweaver is preparing for MOTU team membership and getting that sorted our is one step (goal set up by myself).
[09:21] <StevenK> sunweaver: https://launchpad.net/~sunweaver already exists, you can probably claim it (if it's you), and then merge your existing account into it
[09:22] <sunweaver> StevenK: yeah, that's me.
[09:22] <sunweaver> well... I have just created an account for sunweaver@debian.org and then though better continue using my old one and ask for renaming.
[09:23] <StevenK> login.launchpad.net is not Launchpad, mind
[09:23] <sunweaver> yep.
[09:23] <sunweaver> I triggered that merging thing...
[09:24] <sunweaver> ok, merged has been requested...
[09:24] <sunweaver> now, the launchpad ID probably will be m-gabriel, not sunweaver...
[09:24] <sunweaver> StevenK: can this be changed?
[09:25] <sunweaver> ah well, login.launchpad.net vs. launchpad.net, I guess...
[09:25] <sunweaver> if this is the wrong channel, where can I request such a change?
[09:27] <StevenK> sunweaver: Filing a question against Launchpad itself would be the next step
[10:31] <wgrant> sunweaver: You can change your username at https://launchpad.net/~/+edit.
[10:34] <sunweaver> wgrant: I have already succeeded in doing so...+
[10:34] <sunweaver> Thanks
[14:12] <blueyed> Can the vcs-import for vim get fixed? It appears to be broken since 2011: https://bugs.launchpad.net/launchpad/+bug/1381551
[14:17] <dobey> what's the correct upstream vcs url?
[14:21] <dobey> blueyed: so, launchpad doesn't do imports from mercurial apparently
[14:22] <dobey> and i can't edit the branch import because it just gets an oops
[17:07] <bookwar> hi all, is it possible to export subscribers list from one mailing list and add it to another? We'd like to merge two mailing lists into one without forcing everyone to subscribe again
[18:53] <blueyed> dobey: but are hg imports broken since 2011 in general?
[18:54] <blueyed> dobey: can you file a bug for the OOPS, please?
[18:58] <dobey> blueyed: broken? i'm not sure that imports from hg have ever been supported
[19:17] <blueyed> dobey: oh, it seems you're right. If you can edit the vcs url you could set this mirror: https://github.com/vim-jp/vim
[20:19] <blueyed> I've created a new import for the Git mirror, but it failed: https://code.launchpad.net/~blueyed/vim/trunk-old (Log: http://launchpadlibrarian.net/187433349/blueyed-vim-trunk.log)
[20:22] <blueyed> There is a working vcs-import at https://code.launchpad.net/~vcs-imports/vim/master however.
[20:29] <dobey> blueyed: yes, i set up the master import
[20:30] <dobey> blueyed: i've also linked the new master import to lp:vim
[20:30] <dobey> blueyed: you used the wrong URL; you can just delete the branch you created for the import
[20:32] <ricotz> hi, it seems the old binaries are not getting removed in this ppa, already more the 24 hours now -- https://launchpad.net/~ricotz/+archive/ubuntu/mozilla/+packages
[20:33] <ricotz> it blocks me uploading a fix while there is no free space ;)
[21:44] <blueyed> dobey: I've created a daily recipe for Vim at: https://code.launchpad.net/~pkg-vim/+recipe/vim-daily
[22:48] <_pd_> hi i have a problem where i acidentlly called a package 31 instead of 3.1, so I re-uploaded with the correction, but the package seems cached or something — https://gist.github.com/pdufour/64e3beae7bd0e18c683d https://launchpad.net/~britco/+archive/ubuntu/main
[22:51] <_pd_> actually looks like it's rejecting the upload https://launchpadlibrarian.net/187442120/upload_6464284_log.txt
[22:51] <maxb> Version numbers aren't allowed to go backwards
[22:51] <_pd_> if i even if i deleted the old package?
[22:52] <maxb> Um, they might be then (but you still can't re-use an exact version string, even if deleted)
[22:52] <teward> _pd_: correct - even if you delete the package you can't go backwards
[22:52] <teward> at least not in the version string
[22:52] <_pd_> ok
[22:53] <teward> heh, it's an nginx package...
[22:53]  * teward chuckles a little
[22:53] <_pd_> ?
[22:54] <teward> _pd_: i provide the nginx team's ppa packages, so it makes me chuckle seeing other nginx builds older than latest nginx stable, is all, sorry
[22:54] <_pd_> ha
[22:54] <_pd_> i just try to match what's on the ubuntu ppa, probably overly paranoid
[22:55] <teward> _pd_: s/ppa/repository/
[22:55] <teward> (that's the version in the repos, not any PPA)
[22:55] <teward> any Ubuntu PPA, rather, at least based on that version string :)
[22:55] <teward> anyways, i digress
[22:59] <teward> _pd_: i'm not 100% certain about this, but you can upload while increasing the version string - i.e 1.4.6-1ubuntu31+britco0.6+trusty1 instead of 1.4.6-1ubuntu31+britco0.6+trusty.  I think that'll work, but I might be totally wrong
[23:00] <_pd_> ah thx, will give that a go
[23:00] <wgrant> teward, _pd_: You *can* go backwards if you delete the current version.
[23:00] <wgrant> It's deliberately not documented, but it's possible.
[23:00] <teward> wgrant: are you *certain*?  I've never been able to do that, even after deleting a package in a PPA
[23:00] <teward> wgrant: and I mean ABSOLUTELY certain?
[23:01] <wgrant> teward: Yes, I wrote the code.
[23:01] <wgrant> But you cannot upload exactly the same version ever again.
[23:02] <teward> wgrant: ahh, okay, so is it better to just upload individual revisions with updated version strings, rather than going backwards?  (they're trying to upload the same version, it looks like, by version string)
[23:03] <wgrant> 1.4.6-1ubuntu3.1+britco0.6+trusty <= 1.4.6-1ubuntu31+britco0.6+trusty
[23:03] <wgrant> Not the same version.
[23:03] <teward> wgrant: hmm, true...
[23:04] <teward> wgrant: so they're trying to upload an older revision, ...-1ubuntu3.1+... , but if they delete the package in the PPA then theoretically they can upload the older version?>
[23:04] <teward> s/version/version string/
[23:05] <wgrant> Yes.
[23:06] <teward> _pd_: there's your answer then, delete the package in the PPA, and upload with the older string (the ...-1ubuntu3.1+... version)
[23:06] <teward> if i'm reading wgrant correctly?
[23:07] <wgrant> You are.
[23:08] <_pd_> hmm coulda sworn i tried that, will give it a go again
[23:10] <_pd_> https://launchpadlibrarian.net/187443250/upload_6464369_log.txt
[23:10] <teward> did you actually delete the package yet from the PPA?
[23:11] <_pd_> it says it is deleted, could be cached though?
[23:11] <wgrant> You need to delete the version that holds the newer binaries.
[23:11] <wgrant> The old source is superseded, but its binaries are still alive.
[23:12] <wgrant> On +delete-packages, filter for Superseded and delete the bad version.
[23:13] <_pd_> 31 is deleted http://cl.ly/image/0M25180m2i3a/Image%202014-10-15%20at%204.13.11%20PM.png
[23:15] <wgrant> Oh, you deleted it while the builds were still in the wild.
[23:15] <wgrant> Delete it again.
[23:16] <wgrant> The i386 build hadn't quite finished up when you deleted it last time, so the i386 binaries didn't get deleted.
[23:17] <_pd_> got it