=== bigjools-afk is now known as bigjools
[03:51] <blendedbychris> I don't want to hijack this channel but I'm trying to do something super simple it seems. I've copied another project from launchpad to my own launchpad repo, I'd like to download the source and make some changes  to resubmit to my own repo
[03:52] <blendedbychris> i installed bzr but I'm not sure what to plugin to "branch"
[03:59] <spiv> blendedbychris: "bzr branch ORIGINAL_AS_URL_OR_PATH new-thing"
[04:01] <spiv> (There are plenty of alternatives to that which tweak things in various ways in case you want to re-use the same working dir all the time, etc etc, but that's the quick answer)
[04:04] <blendedbychris> spiv: I found that you can do bzr branch lp:foo.
[04:04] <blendedbychris> :)
[04:05] <blendedbychris> how do i figure out the branch name, or i guess maybe create a new branch/
[04:05] <blendedbychris> this is my ppa btw… nginx is what i am trying to branch. https://launchpad.net/~blendedbyus/+archive/master
[04:25] <spiv> Figure out which branch name?  The one you want to branch from, or the one you are trying to create?
[04:26] <spiv> If you want to push a branch to Launchpad, that's just "bzr push lp:...", e.g. I might do "bzr push lp:~spiv/bzr/new-thing"
[04:27] <blendedbychris> spiv: branch from i pressume
[04:28] <blendedbychris> something like bzr branch lp:~blendedbyus/nginx/trunk …
[04:28] <blendedbychris> but it doesn't list a "branch"
[04:28] <blendedbychris> (maybe because I haven't created one?)
[04:30] <spiv> blendedbychris: PPAs don't necessarily have their source available via bzr
[04:31] <spiv> (Unless Launchpad has grown new features since I last looked at this...)
[04:31] <spiv> In this case, AFAICS there's no source package recipes involved with that PPA, so no directly connected bzr branches.
[04:32] <spiv> It's possible there are relevant bzr branches, but if so Launchpad doesn't know about that link in this case.
[04:32] <spiv> So you'll need to ask the owner(s) of that PPA where/how they recommend working with their source.
[04:32] <blendedbychris> https://launchpad.net/~nginx/+archive/stable << so that has no branch?
[04:33] <spiv> (You can get "source" deb packages from PPAs, but that's a slightly different thing)
[04:33] <blendedbychris> what's a ppa look like when it does have source available?
[04:34] <blendedbychris> Let me do a better job at explaining what I am trying to do. I'm trying to take the latest stable version of nginx (whether it's from their website or launchpad, though I figured launchpad would be useful somehow) and compile it with an additional module.
[04:35] <spiv> I don't know that Launchpad makes that obvious.  It should; file a bug.
[04:35] <spiv> e.g. if you look at https://code.launchpad.net/~nginx/+recipe/nginx-nightly, it says "Daily build archive: Nightly Snapshot" (which is https://code.launchpad.net/~nginx/+archive/nightly)
[04:36] <spiv> And the recipe (in small text at the bottom of that page) tells you that lp:nginx and lp:nginx/debian are used to build those packages
[04:36] <spiv> But I don't see any recipes for the PPA you mention at https://code.launchpad.net/~nginx/+recipes
[04:37] <spiv> blendedbychris: in that case, I suggest just taking their source package from the PPA (i.e. using the deb-src lines and "apt-get source ...", etc), and working with that
[04:37] <spiv> i.e. the standard debian toolchain
[04:37] <spiv> As there's no obvious bzr involvement in that PPA
[04:38] <blendedbychris> doesn't look like this is even up to date https://code.launchpad.net/~nginx/+recipe/nginx-nightly
[04:39] <blendedbychris> woud you suggest trying to make a branch with bzr in my ppa or just submit the deb files?
[04:39] <blendedbychris> (does that even make sense?)
[04:40] <spiv> As I say, there's no obvious use of bzr for making the package (and PPA) you're interested in
[04:40] <spiv> So it seems simplest and most direct to just use the standard debian tools
[04:41] <spiv> i.e. work with the deb source packages, rather than look for bzr branches that probably don't exist.
[04:41] <blendedbychris> fair enouhg
[04:41] <blendedbychris> enough*
[04:46] <blendedbychris> where's ubuntu dump stuff downloaded from apt-get source anyhow?
[04:46] <blendedbychris> the googler is letting me down :(
[04:47] <blendedbychris> oh into the current dir :_
[04:47] <blendedbychris> cool :)
[04:53] <blendedbychris> spiv: a module like this to compile it with nginx should I include it in nginx-1.2.3/src/ or when you run the command ./configure --add-module… do you think it copies necessary files… http://arut.github.com/nginx-rtmp-module/
[04:55] <spiv> blendedbychris: I don't know anything about nginx's build system, sorry
[04:55] <spiv> (Let alone how it may have been patched and configured by Ubuntu)
[04:56] <spiv> You're probably better off asking a #ubuntu-* channel for help, maybe #ubuntu-packaging?
[04:56] <blendedbychris> okay.
[06:16] <mertsas> is it possible to do an interactive rebase with bazaar-rewrite? Want to fix a commit, which has not been pushed up to our main repository
[08:03] <mgz> morning
[08:03] <jelmer> hey
[08:06] <jam> mertsas: if it is a recent commit, the easiest thing is to just "bzr uncommit" fix it then "bzr commit". I don't think rewrite supports --interactive yet, though I also know there is: https://launchpad.net/bzr-interactive
[08:07] <jam> I'm not sure on the workflow for bzr-rewrite of an old revision.
[08:07] <jam> I would gues you could pop back to the one you want to fix, fix it, then 'bzr replay' the rest of the revisions.
[08:12] <mertsas> didn't find an easy way to do it, so did a branch, uncommited all changes to the one I wanted to change, reverted, uncommited, fixed, commited and did a replay from the original before I pulled from the new branch. Tedious, but worked
[08:12] <mertsas> a --interactive would be nice:P
[09:50] <lduros> hello, I have an "upstream" branch and I have a new tar.bz2 of the upstream. I forgot how to add it to upstream again
[09:50] <lduros> I know there is a command
[09:51] <lduros> can't find it in my .bash_history... guess I should have taken notes :-\
[09:52] <lduros> bzr import I guess?
[09:54] <lduros> ah, I knew I asked about that before: http://irclogs.ubuntu.com/2012/07/11/%23bzr.txt
[09:54] <lduros> haha
[09:56] <mgz> hm, I'd poke jelmer but he's dropped of irc...
[09:57] <mgz> lduros: I think you want merge-upstream, but from the log it may be a little more complex
[09:58] <mgz> or import-upstream, depending on how you're working.
[09:59] <lduros> mgz: hmm
[09:59] <mgz> you have one branch tracking the upstream tarballs, and then merge that into another branch with all your debian packaging?
[10:00] <lduros> well this is for IceCat, it's a slightly different flavor of Firefox
[10:00] <lduros> so there are minor changes in a few files
[10:00] <lduros> and some new files
[10:32] <mgz> jelmer: any suggestions for lduros? <http://irclogs.ubuntu.com/2012/08/21/%23bzr.html#t09:50>
[10:33] <jelmer> there is a '
[10:33] <jelmer> bzr import-upstream' command that is part of bzr-builddeb IIRC
=== deryck is now known as deryck[lunch]
=== deryck[lunch] is now known as deryck
[17:17] <elmo> err, did someone make bzr ci with no changes error out in Quantal?
[17:18] <mgz> elmo: you've always needed --unchanged, or do you mean something more specific like return code?
[17:21] <elmo> mgz: the return code
[17:21] <elmo> mgz: I use etckeeper and a dist-upgrade just exploded
[17:21] <elmo> mgz: because of it
[17:21] <elmo> mgz: also, I mean precise not quantal.  so, umm, it seems unlikely bzr changed; let me investigate further, sorry
[19:51] <dpb___> Hi all -- is there a way to remove old binary blobs from a branch?  we have a dependencies branch that could use some cleanup
=== lifeless_ is now known as lifeless
[22:13] <bob2> bzr-rewrite
[22:13] <bob2> note, makes a whole new history