[00:00] AfC: thanks [00:01] AfC: one possible cause [00:01] AfC: they may have run send with strange parameters [00:02] people do the oddest things [00:02] yeah [00:05] jelmer: you're using git too much "bzr add . [00:05] " [00:05] whyforthedot! [00:07] lifeless: :-) [00:07] lifeless: btw, I've pushed an updated version of my split-subsegment branch for your reviewing pleasure. [00:08] jelmer: I'll look at it now [00:08] poolie: thanks for approving my branch; a small request - click on 'approved' at the top too, next time ;) - or 'merge: approved' if doing by mail [00:16] lifeless: thanks for the review [00:16] lifeless, the dkim yak looks at me with big sad eyes [00:18] poolie: lol [00:18] poolie: it is whinging slightly [00:19] 'it'? [00:19] the dkim yak [00:20] its saying 'shave me', 'shave me' [00:20] ah yes [00:20] to the music 'I need to break free', 'I need to be shaved' [00:21] hmm, speaking of which, I should do that too [00:21] poolie: igc's sphinx doc branch can't land until we get some deps on pqm sorted out [00:22] I've queried him unsuccessfully about what they are [00:22] perhaps you can do so with more luck and either let me know, or jsut file an RT directly about it. [00:22] we can't reproduce the failure? [00:23] poolie: its just the sphinx toolchain missing [00:23] I don't know what that consists of [00:23] lifeless, hm bzr-loom, at least as it is in lucid, seems a bit broken by the named branch changes [00:23] poolie: we could/should SRU the trunk fixes for that [00:24] hmm, actually, I know I fixed it for 2.x, I don't know if I fixed it for named branch foo. [00:24] hm [00:24] lifeless: are you landing the split-subsegment branch? [00:24] https://bugs.edge.launchpad.net/bzr-loom/+bug/586602 [00:24] Launchpad bug 586602 in Loom "open() got an unexpected keyword argument 'name' running 'info -v' (affected: 1, heat: 0)" [Undecided,New] [00:24] jelmer: I'm not sure, I did a feed-bzr run, so if it was pending to land, then yes :) [00:25] poolie: looks like not fixed yet [00:25] lifeless, how would you feel about asking people to always tag bugs' regression' [00:25] then we can get some stats [00:25] I'd be delighted to ask people to do that [00:25] or softly prioritize them [00:25] please sire, may I have another? [00:26] jelmer: does the bzr packaging in debian have pristine-tar info yet ? [00:26] jelmer: and is it history-joined? [00:27] lifeless: no, it's got manual merges [00:28] jelmer: how would you feel about dumping the history and switching [00:28] sorry [00:28] was that 'not pristine tar' [00:28] lifeless: yes, not pristine tar [00:28] or 'not connected in history' [00:28] it's connected with bzr.dev in history [00:29] lifeless: I basically ran "bzr merge -rtag:bzr-2.1.2 lp:bzr/2.1; dch -v 2.1.2-1 New\ upstream\ release." [00:29] jelmer: ok, so you should do 'bzr import-upstream --version=2.1.2 TARBALL branch-of-2.1 at rev -2' [00:29] import upstream rather than merge upstream? [00:29] right [00:29] that will import 2.1.2's tarball [00:30] e.g. bzr branch lp:bzr/2.1 -r -2 temp [00:30] cd packaging [00:30] bzr import-upstream --version=2.1.2 tarball ../temp [00:30] bzr import-upstream really should support -r then :-) [00:30] iterative development [00:30] I don't know if james_w has merged it or not yet even :) [00:31] lifeless: Branching first makes my life more complex, I'll see if I can provide a patch. [00:31] jelmer: you'll tear your eyes out. [00:33] lifeless, branching a loom from launchpad (with tip of the plugin) gives me a loom with no thraeds [00:33] is that a known problem? [00:36] poolie: no, and very unexpected [00:36] what does revert-loom do ? [00:37] poolie: the most likely explanation btw, is that the loom on launchpad has never had 'record' called [00:44] ok probably [00:44] perhaps we should have an optional warning to do it [00:49] Good morning. [00:50] hi there spivvo [00:50] poolie: I haven't done PPA uploads for the releases [00:50] I was going to, but I think I'm going to be out of time. [00:50] -sorry [00:50] np [01:13] it looks like http://wiki.bazaar.canonical.com/SourceDownloads is out of date, should that perhaps just point at the launchpad download page? [01:21] yep [01:22] done [01:24] abentley: the fix to the command stuff - to not raise - is at 96% in PQM [01:24] abentley: so should land in a minute or two [01:24] ciao === tchan1 is now known as tchan === _thumper_ is now known as thumper [03:06] lifeless: hello again. Did you see the post to the list about the bad .sig for the 2.2b3 tarball (it seems to have the 2.1.2 sig by mistake)? [03:07] no [03:07] fark [03:07] I should be able to fix now [03:07] I should have just used my automated toolchain, but its not polished yet [03:10] poolie: spiv just told me about the sig issue [03:10] am fixing [03:10] ok [03:10] shouldn't you be flitting? [03:10] yes, in the waiting area [03:10] boring not boardin [03:10] g [03:13] spiv: should be fixed shortly - 4% uploaded [03:19] spiv: ifxed [03:21] lifeless: thanks! [03:21] de nada [03:23] is there anything else? 500 seconds to go :P [03:23] lifeless: not that I know of [03:27] lifeless: have a good flight! [03:27] thanks === poolie changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: poolie | bzr 2.1.1 is out [04:30] hi [04:30] could someone please tell me why I'm getting this error when I try to download a fresh branch in a fresh project? [04:30] bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~humphreybc/about-ubuntu/main/". [04:30] I'm trying to start work in this branch, https://code.launchpad.net/about-ubuntu [04:31] Do I need to do a push first? [04:31] hi humphreybc [04:31] yes, make a branch locally then push there [04:31] benjamin@benjamin-laptop:~/Projects/about-ubuntu/main$ bzr push lp:about-ubuntu [04:31] bzr: ERROR: Not a branch: "/home/benjamin/Projects/about-ubuntu/.bzr/branch/": location is a repository. [04:32] i guess you need to cd into your trunk directory [04:32] benjamin@benjamin-laptop:~/Projects/about-ubuntu$ bzr push lp:about-ubuntu [04:32] bzr: ERROR: Not a branch: "/home/benjamin/Projects/about-ubuntu/.bzr/branch/": location is a repository. [04:32] benjamin@benjamin-laptop:~/Project [04:32] is it because I've used ground control to pull the project first? [04:33] where did you pull it from? [04:33] what do you mean? [04:33] hm [04:34] i was asking what you did with ground control [04:34] but let me ask instead [04:34] so you're trying to start a new project called 'about-ubuntu'? [04:34] yepo [04:34] and there's no code for it anywhere yet? [04:34] nope [04:34] except maybe on your laptop? [04:34] none on my laptop yet [04:34] ok so what does 'bzr info' show? [04:34] bzr info where? [04:35] lol [04:35] I got rid of my ground control folder [04:35] ok [04:35] and just started from scratch [04:35] so to get started you should do [04:35] "cd" [04:35] "bzr init-repo about-ubunut" [04:35] *ubuntu [04:35] "cd ubuntu" [04:35] "bzr init trunk" [04:35] "cd trunk" [04:35] "bzr push lp:about-ubuntu" [04:35] mm [04:35] oh really? I can't just pull down the branch? [04:35] perhaps before doing this you want to make an ~about-ubuntu-dev team? [04:36] and I'm doing all this inside ~/Projects/about-ubuntu [04:36] it sounds like there's no branch to pull yet [04:36] I'll probably be the only person developing for it at the moment [04:36] so can I push say a plain txt file to just initiate the branch? [04:36] sure, so let's change those instructions to [04:37] bzr init-repo ~/Projects/about-ubuntu; cd ~/Projects/about-ubuntu [04:37] bzr init trunk; cd trunk; gedit README; (type something): [04:37] bzr add; bzr commit; bzr push lp:about-ubuntu [04:37] that'd be a nice project btw [04:37] it's not a great window at the moment [04:38] yeah, it's part of the revitalization of the Ubuntu first use stuff [04:39] committed okay, but when I went to push, "bzr: ERROR: Target directory lp:about-ubuntu already exists, but does not have a .bzr directory. Supply --use-existing-dir to push there anyway." [04:39] i wonder how you got that [04:39] and Ground Control is kindly informing me it's a read only branch [04:39] anyhow, yes, add that option [04:39] so Ground Control can't initiate branches? [04:40] yay, that seemed to have worked [04:40] now I wonder if I can pull the project and branch using ground control [04:41] every time I try to use GC it never works, i'm so eager to actually use it! [04:41] sorry, i'm not expert with gc [04:41] so howcome the URL for the branch is "https://code.launchpad.net/~humphreybc/about-ubuntu/main" instead of "https://code.launchpad.net/about-ubuntu [04:42] humphreybc: any LP code questions I should be able to answer [04:43] thumper: Okay, i'll hassle you in the future then :) [04:43] thumper: Brendon sent that email out to everyone too [04:43] are you the only speaker on Monday? [04:44] great, ground control pulled down the branch fine now. thankyou for your help poolie [04:45] humphreybc: https://code.launchpad.net/about-ubuntu points to branches for the project [04:45] humphreybc: all branches have an owner and a name [04:45] humphreybc: they have short cuts, but they don't always translate to a branch location [04:45] humphreybc: although https://code.launchpad.net/+branch/about-ubuntu should redirect [04:45] okay, groovy [04:46] humphreybc: I saw the email, and I think we might convince ajmitch to talk about quickly [04:46] humphreybc: you can always join #nzpug :) [04:46] I'm hopeless at joining channels [04:46] I use Pidgin, you see :P [04:47] humphreybc: try /join #nzpug [04:47] oh yeah, I know how to join channels [04:47] to know and not to do is not to know [04:47] :) [04:47] but pidgin doesn't have an auto-join thing, so every time I start it up, I have to manually join them - hence why I'm only ever in one or two [04:47] well that sucks [04:47] pretty much [04:49] where should I go to talk about python/gtk/glade and all that? [04:51] humphreybc, hm #ubuntu-motu maybe? [04:52] humphreybc, i think it does have auto join [04:52] but i use xchat now [04:52] poolie: really? hmm. I've looked through all the settings and plugins but never found anything [04:54] does pidgin actually work well for irc? i've always had a hard time imagining that [04:54] join the room, then right-click it in the buddy list and choose auto-join [04:54] how do you get rooms to show in the buddy list? [04:54] mwhudson, it's kind of ok but not great [04:54] ohh [04:54] I see! [04:55] mwhudson, i don't think it shows who's in the channel [04:55] you can't ignore joins/parts [04:55] oh and you can't ignore stupid freenode bots [04:55] yeah, the bots are annoying [04:56] so i went back to using empathy for xmpp and xchat for irc [04:57] yeah, i use xchat [04:57] i used to use erc, but i'm gradually getting over the "use emacs for everything" thing :-) [04:59] emacs = bad [05:00] What's that opportunistic developers channel? [05:08] pff === _thumper_ is now known as thumper [08:08] hello! [08:09] can anyone remind me what was the option in bzr commit to close a lp bug, please? [08:09] --fixes [08:09] but it does not close, just add mark [08:09] bialix, ok, thanks! [08:15] ara, --fixes lp:00000 [08:16] poolie, yes, thanks :) [08:16] poolie, how is it going? about to finish the week for you, isn't it? [08:16] hi ara, bialix [08:16] yes [08:16] just ask stephanie :) [08:17] hi poolie ! [09:02] Ok, I have a rough implementation of 'bzr merge-into' that passes some blackbox tests and has a fairly clean core implementation. [09:02] Just in time for beer o'clock ;) [09:03] All that remains is decrufting... [09:03] Have a happy weekend everyone! [09:08] Harumph. All you smug people over there, chasing the Date Line... [09:13] nice one spiv, have a good weekend [09:51] jelmer, I have some problems with bzr-svn finding tags on a particular repository ; it tries once for each new branch, fails, then doesn't try again. Would you like a stack trace? [10:07] awilkins: please file a bug [10:38] jelmer, Clearing out the metadata cache may have fixed it.. on another note, why are tags a per-branch thing and not shared in a shared repository? [10:40] (not that this is a bzr-svn thing) [10:40] Since tags are on revisions not branches, and revisions are fundamentally stored in a repository, should tags not also be stored in the repository? [10:41] awilkins: tags are like a dictionary though [10:41] awilkins: you can't have a tag set on more than one revision [10:41] awilkins: unlike your normal web2.0-ish tags [10:41] awilkins: so if you have multiple unrelated projects in a repo you might get conflicts [10:43] Heh, it was just affecting me after this tag discovery thing because it only does it once the first time it pulls the branch - so the branches that were suffering from it don't have the older tags... repulling them fixes that though [10:43] Just occured to me that if they were a repo-level thing I'd only have to do it once. [10:45] I suppose you could use the same tag on multiple diverged branches and only run into trouble when you wanted to merge them === nlisgo_ is now known as nlisgo [11:02] hi [11:04] i've created a branch in /var/www/. but when i try to do anything to update the branch (bzr merge, right?) i get error that /var/www is not a branch [11:21] millun: how did you create the branch? What does "bzr info -v" report? === nlisgo_ is now known as nlisgo === nlisgo_ is now known as nlisgo === nlisgo_ is now known as nlisgo === nailuj24_ is now known as nailuj24 [16:49] hi [16:51] hey ronny_ [16:51] easy_install/pip install bzr=={2.0,2.1,2.1.1} fails for me - can anyone fix that? [16:52] ok, wait, easy_install actually finds 2.1 === IslandUsurper is now known as IslandUsurperAFK [17:12] Hello! I was wondering if anyone could help me - I'm trying to set up bzr to keep track of a uni project - I want to be able to work on it on my desktop and my netbook and keep a master repo on my desktop. My problem is that I can't figure out how to do it, despite googling for ages! Any suggestions? [17:14] iamlouis: do you want to also have a repo online? [17:16] nailuj24: not just now, I'd rather get it to work before putting it online, and as it's for my course I wouldn't be able to accept any code contributions anyway! I thought I'd set up ssh on my desktop and then log in every now and then and commit changes from my netbook [17:16] that's kinda too broad a question to be able to usefully answer. [17:16] that would work indeed [17:17] I take it you've read [17:17] iamlouis: in general, there's no thing like "master repo". in bazaar, all branches are equal [17:17] yes, the tutorial is a very good place to start [17:18] once you have the basics working on one machine, all you need to do it be able to address the other machine (by ssh as you said, or just see the filesystem over the network) [17:19] and create a new branch from the main one, so you can pull/push between them [17:19] probably don't need to worry about merging as it's only you working on it [17:23] I've looked at the tutorial, but a lot of it went over my head, I haven't really used a version control system before which probably doesn't help! I added a new user, created a branch and have a bzr server running, but I can't seem to commit changes to it, I'll go away and read the tutorial again, then maybe come back when I get totally stuck/confused! :-D [17:23] iamlouis: you don't need a server with bazaar :) [17:23] iamlouis: that's the good thing about it [17:23] iamlouis: basically, you commit to a normal directory [17:24] nailuj24: so how would I sync commits on my netbook and my desktop? [17:24] (sorry for asking idiotic questions btw!) [17:24] no problem. in theory, you just have two directories and keep them in sync [17:25] i found this very helpful when i started with bzr http://doc.bazaar.canonical.com/bzr.dev/en/mini-tutorial/index.html [17:26] thanks :-) [17:48] iamlouis: if you can connect to your desktop via ssh and bzr is in your path, you can 'bzr push bzr+ssh://iamlouis@desktop/~/uni_project' [17:48] iamlouis: and be done [17:49] iamlouis: do some tests to understand when you need to 'bzr update' [17:50] iamlouis: later, you can also look at 'bzr bind :push' on your laptop and 'bzr bind' when your desktop is not reachable (aka you're not connected to internet) [17:51] vila: thanks, I think I'm slowly getting there - just trying to set up the ssh server now on my desktop. I've got the local repo on the desktop working nicely, that mini-tutorial is brilliant [17:51] vila: cool, I'll look at bind once I get the basics sorted, thanks [17:51] iamlouis: oh, and after the first push you can just 'bzr push' (search for the --remember option) [17:52] vila: great, thanks [17:52] iamlouis: start without bind, you'll use it better once you're a bit more familiar with push and update [17:53] vila: will do, thanks === beuno is now known as beuno-lunch [17:55] vila, your computer survived then? [17:57] mgz: no [17:57] ack. [17:58] mgz: but I think I've got all the needed services restored: web, mail, ssh and gpg auth [17:59] mgz: the HD died and since it wasn't serviceable (I swear I tried, but I resigned at step 3 when the DIY had 20 steps + 20 backwards of course) [18:00] may it live happily in machine heaven. [18:01] I had to find a repair store, the best I found will give me my mac back with a new HD next wednesday (yes, tuesday at best( [18:01] You live and learn :) [18:01] The hard part that I was also running my "main" host as a vm there... So I lost not one but two machines [18:02] Most of the backups were already in place on the laptop, and I had a 95% backup of the dead HD, but getting the last 5%... [18:03] Ever heard about putting an HD in the freeze to make it work just that more minute to get this file pretty please nothing else fullpath given no cd I swear ? [18:04] heh, yeah, that trick is famous, no idea how reliable it actually is [18:04] Well, I couldn't use it because my freeze is too small or a 24", but yes, waiting even for 20 minutes that the HD cool down, even at room temp, helped [18:04] s/or a 24/for a 24/ [18:05] vila, it worked for me, but not for long. [18:05] But I used it on an old HD with good results some years ago [18:05] the only hdd I've had trouble with refuses to actually die, it just got less and less reliable until I got fed up with it making my computer hang [18:05] rockstar: yeah, I'm not suprised [18:05] vila: you mean you can't get your HD out? [18:06] mgz: I stopped playing with that long ago, a dieing HD is worse than any other hardware failure I can think of (on the other hand bluetooth these days...) [18:07] guijemont: 20 steps+20 backwards ^ [18:07] mac ? [18:07] it's a mac, guijemont [18:07] guijemont: The HD is *behind* the LCD [18:07] they don't make it easy. [18:07] ok :) [18:07] that's soooo simple on a thinkpad [18:08] 1/ remove one screw [18:08] 2/ take the hard drive [18:08] mgz: that's a bit exaggerated, but this model is reputedly the worse, in fact the DIY was for a 20" and some guy had left comments about... well has left a patch [18:08] really cool when I had to send imne for repair for sucky usb ports [18:08] they let me the choice to *not* send my hard drive with all my data [18:09] guijemont: the LCD itself couldn't be bought at that time, trust me that was a bargain [18:10] I've only seen HD died three times, but this last one was the most aggressive and devastating one [18:11] makes me think I should back up my stuff more [18:11] guijemont: Hehe, be honest, when was the last one ? [18:11] so far I've been lucky with HDs, but I don't believe this is always gonna be the case [18:12] vila: well, err, ...kinda [18:12] I did that when I installed karmic on my laptop [18:12] since I changed from reiserfs to ext4 [18:12] who do i need to bug to fix easy_installablilty of older bzr releases that may still be in the wild [18:12] I copied all my stuff on an external HD, and didn't delete it from there afterwards [18:12] not me, easy_install is the devil. [18:13] rockstar: wow, that's kinda vague... versions ? OSes ? [18:13] wrock r-tab? [18:13] *wrong. [18:13] dammit. [18:13] * rockstar looks up [18:13] errr, sorry rockstar, that was for ronny_ bad xhat, no sugar [18:13] ronny_: wow, that's kinda vague... versions ? OSes ? [18:13] vila: anything older than 2.1.1 cant be installed with pip/easy_install [18:14] vila: and well, i really could use that for my build process for the anyvc ci server [18:15] rockstar: that leaves only 2.0.6 for which we will gladly accept patches I think :) [18:16] ronny_: but we recommand 2.1 over 2.0 anyway, the former has received optimizations and bug fixes and there is no good reason to *not* upgrade [18:21] bah, so much for testing that. [18:21] bzr-git needs dulwich needs a C compiler. [18:22] vila: well, this is just for having backward-compatibility tests in my ci [18:22] I'm not launching on upgrading this box from lenny right now, or deleting enough stuff to fit gcc on there [18:24] ...I guess I can always remove gcc after... okay then. [18:24] ronny_: I don't get it, I'm all for automated tests, but backward comp of what with what ? [18:25] mgz: You have a lenny setup ??? [18:25] ...which... still failsm, errors in dulwich/_objects.c [18:26] ^yup, on my old box [18:27] 's a K6-III and not a big HDD. [18:27] If you need a bigger HD and have a fridge I may make you an offer you could not resist in a couple of days... [18:27] ehehhe === IslandUsurperAFK is now known as IslandUsurper === beuno-lunch is now known as beuno [18:30] mgz: oh, and I should have a fix for most of the thread leaks RSN, I'm sorry it took so long to get some progress on the indows32 stuff [18:30] vila: bzr versions that are still in the wild? [18:30] it's not an easy fix, if you'd have done it in a day I'd have almost been offended :) [18:30] mgz: The main source of thread is now SocketListener [18:32] ronny_: if that's for automatic installs, can't you just 'bzr pull --overwrite -rtag:xxx ; make ' and run from source ? [18:33] ronny_: I mean installs in the ci context (hudson ?) [18:34] mgz: I'm around 50 tests leaking and most of them come from this single point [18:34] * vila off, may pass around later [18:35] ah, now I see, don't have Python headers on here for some reason [18:35] vila: i'd have to script that, and only for bzr, wouldnt be worth it [18:35] later vila, good news on thread leaks, if not hard drives. [18:41] vila: cheers for your help earlier, got it working now, thanks! [18:48] i wouldnt have any issues if the bzr guys would actually upload their releases to pypi :( [18:50] using setuptools is asking for issues. [18:53] mgz: im using pip install, works fine, caches after the first install, and generates no issues [18:53] mgz: however that needs the releases to be findable somehow [18:54] and older bzr releases arent findable [18:54] scraping webpages for binary code isn't a great way of doing things. [18:54] mgz: scraping the pypi index for source packages is reasonable enough === BasicPRO is now known as BasicOSX [19:29] I've got a simple quesiton whose answer I couldn't find in the docs: how do I get bzr to display its currently remembered locations? [19:43] Can I expect "bzr revert; bzr update; bzr clean-tree --force --ignored --unknown --detritus" to give me a working tree that's exactly the same as one I'd get from a clean "bzr checkout"? [19:58] I would certainly think so. I can't see how there would be any difference left after that [19:58] bitdancer: bzr info [19:58] Darn it, it turns out I want one difference to remain :/ [19:59] maxb: ah, so simple. Thank you. [20:00] maxb: except that it doesn't tell me what I want to know. [20:00] :( [20:01] Does it not? What did you want to know? [20:11] bitdancer: ? [20:13] maxb: I figured it out. It said 'parent branch' and I was expecting 'pull branch' or something like that. [20:14] what I want is to know what branch is going to be used if I omit the branch on any given command. [20:15] so I'm still not sure what that will be in all cases, but I'm sure I'll learn soon enough. [21:33] bitdancer, bzr info will give you that information on a branch === nlisgo_ is now known as nlisgo === Adys_ is now known as Adys