=== medberry is now known as med_out [00:59] can i use bzr-buildpackage with only debian/ in revision control, or do i need to have upstream source there too? [01:04] it can work either way [01:05] perfect. i'll just keep debian/ around then. [01:05] thanks :) [01:08] Say I've previously I did a [01:08] $ bzr branch lp:ubuntu/empathy natty [01:08] It was "natty" at the time. Now I pull and suddenly it's "oneiric". I guess it did what I told it to, but I surely didn't get what I wanted; I thought I had a branch with natty's version in it [01:09] Is there a modification to the lp:ubuntu/package syntax to bind it to a specific release series? [01:13] AfC: i think lp:ubuntu/natty/package works [01:14] * AfC tries `bzr missing` with that [01:16] Grr. Why oh why is it transferring megs and megs of data to give `missing --line` when I already have the revisions present! [01:16] Anyway [01:16] mwhudson_: yes, that works. Thanks [01:26] related to my last question, is it possble to copy the debian/ dir between repositories keeping history? i'd like to move it from packagename/debian into shared/packagename/debian so i don't have to carry all the source too === mwhudson_ is now known as mwhudson [02:45] If I would like `bzr builddeb` to build both a source package and a .deb binary package, what options would I do? [02:45] $ bzr builddeb -S -- ... [02:45] seems not to build the .deb [02:45] (ok, fine) [02:45] but what is the complimentary option? [02:45] Or should we not use `-S --` and instead be doing `-- -S -sa` or so? [02:46] -S == source only [02:47] [the other problem I ran into is about 1 of 15 packages I've done lately didn't have the .orig.tar.gz available in target distro, so uploading to PPA bombed, whereas the rest of the time it all Just Worked™ leaving me quite gunshy] [02:48] [and thinking for good measure I should always be passing `-- sa` [06:35] hi bzr people [06:35] I have some code right now that works on working trees [06:36] handling things like adding or editing files [06:36] I want to write some other code that does the same work, but works on a branch instead [06:36] how do I get a tree representation of a branch that I can use like a working tree? [06:37] is a revision tree the way to go? [06:50] yyou can use a revision tree + a transform [06:50] the lp translations export code does this, if you want to cargo cult [07:06] hmm... [07:06] lifeless: ta [07:39] maxb: about to restart the package importer, anything I should know ? [07:44] vila: for anything in particular? [07:44] maxb: well, no, that's the trick :) Anything that crosses your mind ! [07:45] I was wondering if I need to fix my change to the path to lp_creds.txt first [07:45] maxb: p-i stopped [07:45] maxb: argh, landed ? [07:45] yes [07:45] maxb: wait, no need, your change is ok for jubany right ? [07:45] so you can do that later [07:46] I thought it was ok, but now I think I may have miscalculated the number of dirname calls [07:48] maxb: depends on local setups if I read it correctly it works for udd/branch but not for udd/bugs/branch and anyway you can't have both [07:48] maxb: the real solution is to have it in pkgimport.conf anyway [07:49] I am somewhat unconvinced about pkgimport.conf, unless it supports relative paths [07:49] maxb: waiting for GSA to update the script and then start the pi again [07:49] maxb: relative to what ? [07:49] to the file itself ? [07:50] Possibly [07:50] wow, 'somewhat' 'possible', you make it hard to satisfy :) [07:50] Anyway, I think jubany is now going to be looking for lp_creds.txt in the wrong place - /srv/package-import.canonical.com/new/scripts/ rather than /srv/package-import.canonical.com/new/ :-/ [07:50] what's wrong with conf file ? === hunger_ is now known as hunger [07:51] maxb: are you sure about that ? losa is ready to start it again, should I hold him ? [07:53] Yes, sure :-( Probably best to just put in a symlink for now, to not block on admin actions [07:53] i.e. cd /srv/package-import.canonical.com/new/scripts/ && ln -s ../lp_creds.txt [07:53] maxb: confirmed [07:54] maxb: done [07:56] maxb: re-started [08:00] thanks [08:01] can you requeue --all-of-type bzr ? [08:01] maxb: and stopped [08:01] oh [08:01] maxb: and started again [08:01] ? [08:02] mass-import is bogus for 'restart' it doesn't delete STOPFILE, I'll file a bug and fix [08:02] oh, heh [08:02] maxb: requeue done [08:02] I have also filed a MP to minimally undo my path thinko [08:05] maxb: cool, could you mention that we need to delete the symlink when this lands ? [08:07] s/need to/can/, but yes [08:08] * vila nods [08:08] maxb: just making sure someone don't run into it and spend time wondering why it's there [08:09] Hmm, there are a bunch of spurious failures - I suggest requeue_package.py --auto linux-restricted-modules haskell-utf8-string language-pack-kn language-pack-sq-base [08:10] maxb: old spurious or new spurious ? [08:11] maxb: wow, nice to the failure split ! [08:13] maxb: requeue done [08:14] rhaaa lovely... finally I can type just 'categorise_failures.py' [08:15] oh? [08:15] yeah, fixit.sh set the right env vars.... [08:16] So, 465 failures... now we just wait to see how many of the currently retrying ones succeed :-) [08:17] maxb: should we proceed with bug #795703 then ? :D [08:17] Launchpad bug 795703 in Ubuntu Distributed Development "jubany fixups relating to misplaced tags (AssertionError::main:find_unimported_versions:check)" [Undecided,New] https://launchpad.net/bugs/795703 [08:21] Yes - shall I sort the instructions for the new fixit syntax now? [08:22] maxb: as you will, I'm doing it right now, we can compare notes (I don't mind a double-check there ;) [08:22] s/will/wish/ [08:22] s/as you wish/yes, please do/ [08:22] or something ;) [08:26] hmm, right, UI mistake, the package should come first, that's what we are acting upon (a GUI could display the relevant packaging branches or even tags, allow selection then action) [08:26] we'll see to it later [08:28] done, posted to the bug. [08:28] And I wish launchpad could be asked not to line-wrap for displa [08:28] y [08:28] it all comes out right in copy/paste, though [08:28] at least copy/pastin works... [08:28] hehe [08:29] awesome, the failure count is going to settle at at most 469 already [08:30] which is a nice step down from the 485 we were at when all this LP mess started [08:32] maxb: yeah, well done === maxb changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: spiv | UDD failures: 465 [08:36] maxb: http://paste.ubuntu.com/630689/ ok ? [08:38] ah, oops. yes [08:42] no problem, I had one too :) double checks are good :) [08:44] maxb: procedding [08:45] a bit slow [08:45] of course establishing ssh connection for each command doesn't help [08:46] Right, so that's A through E. [08:47] I should have a look at the rest of the alphabet :-) [08:47] owww [08:47] done [08:48] maxb: and report posted on comment [08:49] Hmm, I need to revisit bug 494481 one of these days [08:49] Launchpad bug 494481 in Ubuntu Distributed Development "Too easy for people to not use merge-upstream" [High,Triaged] https://launchpad.net/bugs/494481 [08:50] maxb: pfew, that took long overall (sorry for that) but I think it's a nice step in the right direction [08:52] maxb: feel free to update the topic ;) [08:53] I'll be waiting on that to check that they *actually* succeed :-)[5~ [08:54] shouldnt' be long now, 0 outstanding jobs [09:02] jam, Riddel: jelmer being sick, spiv offline, poolie sleeping, sprint next week, should we drop the standup ? [09:03] vila: I'm fine either way [09:04] I don't mind [09:04] Hmm, it's looking quite achievable to drive the Ubuntu main UDD failure count below 100 in the next fortnight [09:04] was going to try and convince people to review my gpg stuff [09:07] do we know what we're doing at the sprint next week? [09:13] maxb: what about bug #796751, should it be marked invalid ? [09:13] Launchpad bug 796751 in Bazaar "TreeTransform _override_conflicts checking is not sensitive to symlinks" [Medium,New] https://launchpad.net/bugs/796751 === maxb changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: spiv | UDD failures: 455 [09:14] \o/ [09:14] Yes, I think it should [09:16] done [09:17] hehe, done too :) [09:25] maxb: boom http://webnumbr.com/ubuntu-package-import-failures.from%282011-06-16%29 :) [09:27] maxb: setting bug #795703 on the assumption that you'll post more there [09:27] Launchpad bug 795703 in Ubuntu Distributed Development "jubany fixups relating to misplaced tags (AssertionError::main:find_unimported_versions:check) [package names A through E]" [Undecided,In progress] https://launchpad.net/bugs/795703 [09:27] maxb: setting it 'im progress' that is... [09:32] hah, nice graph [09:32] vila: I've landed the lp_creds.txt path change, if you want to deploy and then remove the symlink [09:33] maxb: done, waiting a bit to delete the symlink (just because) [09:36] maxb: ha right, just got your mails about the symlink, good, we're on the same page [09:57] is there a way to make bzr only show files below `pwd` that have been modified? (like svn would). i keep trying to copy+paste the paths it tells me are modified and realsing i'm not in the repo root [10:00] Kamping_Kaiser: not that I know of but I'm pretty sure there is a bug about that [10:02] vila: i'll have a look on lP, cheer [10:02] s [10:43] can i do something in bzr if i want to redirect http attempts to access foo/packages/ so its foo/packges-version instead? would i have to do it using the webservers rewriting, or can i use bzr somehow? [12:17] There's an incomplete sentence at http://doc.bazaar.canonical.com/latest/en/mini-tutorial/#starting-a-new-project where would be the best place to report that? [12:27] a7ndrew: bugs.launchpad.net/bzr or if you can work out how to fix it we can just commit the fix [12:28] well I know how to fix it, just need to think about what text [12:50] I'm not quite sure what the author meant to say to finish off that sentence. === zyga-food is now known as zyga [12:57] a7ndrew: well report a bug and we'll get to it === med_out is now known as medberry [14:48] How would it be possible for me to have a shared respository which also seems to have revisions in it? i.e. it has shared sub branches but if I run bzr log I also have revisions [14:48] This repo was originally created in 2006 so it is quite old [14:53] johnf: you can have a branch coexist with a repository. In fact a standalone branch is exactly that [14:53] I remember being puzzled by this too === oubiwann` is now known as oubiwann === joey` is now known as joey [16:24] hi all [16:24] johnf, i think we now warn if you try to create that but it may have been possible in the past [16:25] or, obviously, yo ucould just move the branch directory [16:28] good $timeOfDay poolie [16:28] poolie: I don't notice any warning if i run init-repo then init === zyga is now known as zyga-food [17:04] hello there [17:04] hm === deryck is now known as deryck[lunch] [17:31] * maxb marves at bug 800771 [17:31] Launchpad bug 800771 in Bazaar "pull -overwrite overwrites not only files but all information about commits" [Undecided,New] https://launchpad.net/bugs/800771 [17:31] *marvels === deryck[lunch] is now known as deryck === deryck is now known as deryck[lunch] [17:53] Impressive. [17:54] Nice. [18:24] hello [18:28] I have a question (that may sound a little stupid). But I have a project that is going to be setup for a few clients. Each client will have specific (personal) code implementations. I was thinking of branching my project for each client but then how would I go about correcting, say.. a bug accross all branches? [18:28] or am I not going the right way with this? [18:29] I'm kind of looking for a way to make patches [18:31] is there maybe a way to shelve changes and then share them with another diverging branch? Or is there maybe a way of merging a single commit and dealing with conflicts? [18:32] Any help would be appreciated I couldn't seem to find anything about this in the documentation [18:32] pommeverte: do you mean like "bzr merge -c" ? [18:34] hmmm what does the -c do? [18:34] (looking through man) [18:35] merges just the changes in one particular revision [18:40] hmm well yes that sounds exactly like it. Completely overlooked it since I checked the (outdated) man online [18:40] thanks [18:40] do you think this is the best way of going about it? [18:43] I think so [18:44] ok perfect. Thank you very much === deryck[lunch] is now known as deryck === yofel_ is now known as yofel === zyga-food is now known as zyga [20:25] hi jelmer [20:25] hi poolie [20:44] how's your week? [20:48] apart from the sick day, pretty good [20:50] I did some more Launchpad work this week, and had a look at adding support for multiple upstream tarballs in the package importer. [20:50] oh, right [20:50] i hope you're feeling better [20:50] I am, thanks :) === yofel_ is now known as yofel [22:19] Hey there [22:21] Hello [22:21] I've made a small bzr repo on my server. My workflow is to create branches for each feature I work on and then merge them into trunk and delete the now useless branch. I've discovered I can easily push new branches up to my small server, but I haven't found yet how to delete them. [22:22] Could you give me a hand? [22:23] There is not a command within bzr itself for deleting branches. People usually just rm -rf them [22:23] ah [22:23] :/ [22:24] the thing is, I'm not working alone, and I'm restricting the ssh access of the other devs to running bzr [22:24] is there really no way to accomplish this but rm -rf? [22:25] bzrtools provides "bzr zap --branch" - i've never used it though, so I don't know if it works remotely [22:26] well that's a start anyway. I'll give it a try [22:26] thanks maxb [22:27] mmh [22:27] that doesn't seem like the right thing. [22:27] I guess I'm good for posting a feature request :) [22:59] <__yhvh__> hey I built in a recently downloaded repo, did make clean and make distclean, bzr status shows loads of files changed [23:00] <__yhvh__> I also rm'ed the whole thing and d/led again fresh but the modified still show up, [23:00] <__yhvh__> is this info stored outside the repo dir?