[16:33] <elopio> cgoldberg, nuclearbob: I'm going to merge the change that landed into archive for autopilot yesterday.
[16:33] <elopio> and then update the merge proposal for new new landing on the silo.
[16:33] <nuclearbob> elopio: seems reasonable to me
[16:33] <cgoldberg> sounds greek to me :)
[21:12] <elopio> ping veebers
[21:12] <elopio> hello.
[21:13] <elopio> I was trying to push the autopilot release, but it got complicated.
[21:15] <veebers> elopio: hey sorry was OTP, what's the issue, doesn't sound good :-\
[21:16] <elopio> veebers: it's not bad. It's just that a changeset that's not on trunk or on the 1.5 branch is on the archive.
[21:17] <elopio> so we need to merge it before landing. But when I was going to do it I got confused, I'm not sure how you are using trunk so I didn't know in what branch to do the merge.
[21:17] <elopio> this is the changeset: http://launchpadlibrarian.net/181532211/autopilot_1.5.0%2B14.10.20140716-0ubuntu1_1.5.0%2B14.10.20140716-0ubuntu2.diff.gz
[21:18] <veebers> elopio: ugh, that happened last time too :-( we use lp:trunk as our development branch (i.e. day to day changes reviewed and merged to it) and then release into lp:autopilot/1.5
[21:18] <veebers> it's not a perfect system as we have a branch or two that are bottom approved but can't top approved as they will be merged into trunk and thus released without meaning to
[21:18]  * veebers looks
[21:19] <veebers> elopio: as that's already in archive, I would just merge it directly (I'm pretty sure that's what I did last time)
[21:19] <elopio> veebers: yes, it already has results on the dashboard, so we don't need to test again.
[21:21] <veebers> elopio: So I'm pretty sure what I need to do is merge that changeset into trunk, push it and rebuild the silo, yes?
[21:21] <elopio> veebers: I think merge that change into 1.5
[21:21] <elopio> because the changelog shows one more entry that's only on 1.5, not on trunk.
[21:22] <elopio> that's where I get stuck and prefered to wait for you.
[21:22] <veebers> elopio: rats, I'm not sure then because then that change won't be in trunk
[21:24] <veebers> elopio: let me ask someone
[21:26] <elopio> I thought that if you merged it with the one you are landing, it would get to trunk at some point.
[21:26] <elopio> but yeah, sounds problematic.
[21:37] <thomi> veebers: just push to both
[21:37] <thomi> or push to 1.5, and merge back to trunk
[21:37] <thomi> and then go ask Steve nicely if next time he could please prepare a MP for any changes to the AP packaging
[21:44] <veebers> thomi: sweet, merging back to trunk sounds easiest, cheers
[21:59] <veebers> elopio: right, that changeset now exists in trunk and 1.5, what needs to happen now to proceed the release work you were doing?
[22:04] <elopio> veebers: somebody from ci needs to publish the package.
[22:04] <elopio> oh, wait, you need to rebuild the silo I think
[22:07] <veebers> elopio: cool, I can rebuild now
[22:08] <elopio> thanks veebers.
[22:16] <veebers> elopio: rats, now I have to sort out a changelog of my own for it to proceed