[00:31] hey jelmer [00:32] lifeless: btw, I did a new linux benchmark with hg now too. [00:35] rick_h_: did you manage to figure out the authentication bits in bzr-svn? === lamalex is now known as lamalex_2 === lamalex_2 is now known as lamalex [03:08] has anyone used the bzr addin for monodevelop? [03:10] hey guys, is there something similar to svn:externals in bzr? [03:10] I've heard of it but donno if it's for real [03:18] I use bzr-svn with a project with svn:externals. I just ended up checking out each external locally and ln -s to the externals dir [03:58] * Peng branches from a server and is told that the working tree format used on the server is old. === jam changed the topic of #bzr to: Bazaar version control system | http://bazaar-vcs.org/ | bzr-1.5rc1, May 9 | http://irclogs.ubuntu.com [04:32] poolie: I'm having some trouble building the source packages for bzr-1.5rc1 [04:32] I'm following your instructions [04:33] though I had to "apt-get install fakeroot" which wasn't mentioned [04:33] Anyway, I'll email you, but 1.5rc1 is released, but isn't uploaded to the ppa yet [04:33] man, having to create a release for each supported version is a PITA [04:34] not to mention multiplying that by the extra packages (bzrtools, etc) [04:38] jam: I think the LP guys have a tool to automatically do the the changelog munging, etc. to do multiple release at once [04:39] LaserJock: not according to: http://doc.bazaar-vcs.org/bzr.dev/developers/releasing.html#publishing-the-release [04:40] anyway, I need to go to sleep now [04:40] jam: I mean, I think one of the Canonical guys built a script [04:49] jam, can I help with the packaging? [04:51] jam, I'd happy to work it out and upload [05:11] jam, uploading hardy now [11:06] hello all [11:07] is anyone able tell me why i keep getting errors like this when i try to revert single files, please? [11:07] $ bzr revert -r 51 tasks/views.py [11:07] bzr: ERROR: Permission denied: "/home/gabriel/studiomaker/tasks/views.py/.bzr/branch-format": [Errno 13] Permission denied: u'/home/gabriel/studiomaker/tasks/views.py/.bzr/branch-format' [11:11] file permissions? :D [11:16] nah not at all [11:17] i can just do: bzr revert [11:17] and that will revert loads of files without a problem, only if i single out a file [11:17] see: [11:17] r$ bzr revert [11:17] M tasks/models.py [11:17] M tasks/templates/task_list.html [11:17] M tasks/tests.py [11:17] M tasks/views.py [11:17] M urls.py [11:17] sorry, shouldn't paste here [11:18] is that because i have version 1.3.1-1? [11:49] gabees: could you please pastebin the output of "bzr -Derror revert tasks/views.py"? [11:57] james_w: sure, just a sec [11:59] james_w: here you are http://dpaste.com/49204/ [11:59] quite a lot of stuff in there [12:00] gabees: that does look like a bug, can you please run "bzr info" and tell me what the formats you have are? [12:02] Checkout (format: pack-0.92) [12:03] repository: Packs containing knits without subtree support [12:04] i upgraded from 0.9 to 1.3 [12:04] bzr upgrade [12:04] then [12:04] bzr reconcile [12:04] but the reason i upgraded was because i was getting these errors in the first place [12:05] hmm, I can't reproduce in a simple test. [12:05] wih 1.3.1? [12:05] with [12:05] Bazaar 0.9? [12:05] Not 0.90? [12:05] yeah prob 0.90 [12:06] it was in gutsy gibbon [12:06] now on hardy heron [12:06] Yeah, 0.90 then. [12:07] and all of a sudden started seeing these errors [12:07] so i thought i'd upgrade bzr [12:08] but ended up upgrading the entire system to hardy just to get bzr 1.3.1 :) [12:08] Haha. [12:08] Well, it's good to upgrade anyway. [12:08] And bzr is totally worth the effort, right? ;) [12:08] yup [12:08] bzr has been so good [12:09] i've got tens of project's source code in bzr [12:09] if you want I can zip up my small branch and send it to you [12:09] then you can test and see what is wrong? [12:10] gabees: if you can do that it would be great. I should just need the .bzr/ [12:11] is the code open source? [12:11] well not really [12:11] it's for my work [12:11] but i've hardly started [12:12] if it helps to make bzr better then i don't see any problem :) [12:13] just be a couple of mins, just uploading to our server [12:15] sure, just wondering if I could make it available in a bug report if need be. I should be able to make a small test case out of it, so it shouldn't be an issue. [12:17] mm [12:17] should be ok [12:19] here is the url [12:19] http://dev.pixeco.com?file=bzr-error.tar.bz2 [12:22] james_w: did you get that file ok? [12:24] sorry, was in the shower [12:29] echo a >> tasks/views.py && bzr revert tasks/views.py works fine for me here. [12:29] both 1.3.1 and trunk sometime before 1.5 [12:32] are you familiar with the python debugger? [12:33] If you set BZR_PDB=1 in your environment you get a debugger at any exceptions, so you could poke around and see if anything is amiss. [13:02] james_w: how come i was getting errors then? [13:02] gabees: I'm not sure, sorry. [13:03] james_w: what OS are you on? [13:03] ah, maybe I do. I was assuming it should'nt probe for that file, but it should [13:03] hardy. [13:03] i just tried your code [13:03] get the same error [13:03] echo a to views.py [13:04] then revert [13:04] however [13:04] is there anything weird about your filesystem? NFS etc? [13:04] a plain old: bzr revert [13:04] works just fine and returns views.py to normal [13:04] james_w: ahhh [13:04] it might just be that [13:04] i'm on HFSPlus [13:05] i have another hardy box on ext3 so i'll try that... [13:05] I think the problem is that it is returning permission denied, rather than ENOENT [13:09] yeah i think so [13:09] i just tried it on the ext3 box [13:09] worked no problems [13:10] although... $ echo a >> tasks/views.py && bzr revert tasks/views.py works fine for me here. [13:10] bzr: ERROR: Path(s) are not versioned: works fine for me here. [13:10] ah yeah [13:11] dumbass me [13:11] r$ echo a >> tasks/views.py && bzr revert tasks/views.py [13:11] M tasks/views.py === abadger1991 is now known as abadger1999 === nekohayo_ is now known as nekohayo === emgent_ is now known as emgent [15:49] james_w: thanks for your help earlier [15:50] I've now reformatted the filesystem from HFSPlus to ext3 and bzr is fine again [15:50] I'm not sure what I will do if I need to boot OS X but I'll cross that bridge when I get to it [15:59] gabees: it's probably a good idea to file a bug, there may be something that can be done to fix it. [16:00] at least it would be documented for others then. [20:03] Hi, I'm trying to use bzr send, but when the email pops up there is no diff or bundle attached. Any tips? [20:04] I've got one local commit to send (it's for the extmerge plugin) [20:04] A thunderbird mail window pops up with the subject set correctly, but that's it. Dunno what I'm missing. [20:12] I want to checkout a repo over http that contains '~' in the url and I get "Connection reset by peer" when using bzr, but opening the site in the browser works fine. Any idea? [20:15] hey [20:15] anyone here uses bzr with emacs ? [20:16] sebp: show the exact command that you typed [20:16] trepca: bzr branch http://www.gnome.org/~sebp/bzr/python-dvb [20:18] interesting [20:18] is it a bug? [20:20] pickscrape, does: bzr send -o test.patch [20:20] create a patch with the diff? [20:21] looks like or maybe bzr establishes too many connections which server doesn't like [20:21] beuno: It creates a file, but there is nothing between #Begin patch and # Begin bundle (though there is data after #Begin bundle) [20:21] in both cases ... probably a bug [20:22] Oh, intersting. I just pulled my branch to a different machine, and on there the test patch looks a lot more like it. [20:23] pickscrape, you have to have a branch to compare it against to generate the patch [20:23] so, it would be something like: bzr branch original_branch; bzr branch original_branch hackish_branch; hack hack; bzr send [20:23] Should it not just pick up where I originally branched from, or do you always have to specify that explicitly the first time? [20:24] pickscrape, it should pick up where you branched originally [20:24] but, in case it doesn't, you can specify it manually [20:24] trepca: okay, I file one, thanks [20:25] Looks like on the other machine it's doing the right thing with -o [20:25] But not when omitting that and bring up the compose email window... [20:25] pickscrape, odd. What version of bzr are you using? [20:26] jam, btw, sorry about overstepping you with the packaging and screwing up... :/ [20:26] On this new machine it's 1.5rc1 [20:26] On the machine which -o doesn't work for it's running 1.4 === emgent_ is now known as emgent [20:27] pickscrape, can the other machine still access where you branched from? [20:27] Not long back I contributed a small change to bzr-svn and send worked brilliantly: it even filled in the To: part for me. [20:28] Yes, it's on launchpad (lp:bzr-extmerge) [20:29] pickscrape, and bzr output the URL correctly when you do send "Using saved location:..."? [20:29] have you committed your changes? [20:29] Yes, I see my changes at the top of bzr log. [20:30] bzr send -o should be very straight forward, so if it's outputting a blank patch, bzr isn't seeing any changes for some reason... [20:30] And when running send I get "Using saved location: lp:bzr-extmerge" [20:30] On the 1.5rc1 machine -o *is* producing a sensible patch. [20:31] On the other one I think its memorised branches are a bit messed up. [20:31] pickscrape: maybe send in 1.3 didn't do directory service url expansion yet? [20:31] pickscrape, you might want to try and use an absolute URL instead of the lp: shortcut, just as a test [20:31] 1.4 [20:31] ok [20:31] What is meant by 'submit branch' in the bzr info output? [20:33] the branch bzr send will work against [20:33] That explains why -io on my 1.4 machine is producing an empty patch. It's currently set to '.' [20:35] Yep, that sorted that problem. So it's just the attachment to email that isn't working now. [20:35] how do you change what branch bzr submit is set to? [20:36] I did bzr send -o test.patch --remember [20:36] cool [20:36] There's probably a more elegant way though [20:41] Oh, I've got it. The problem is xdg-email. [20:41] If I put thunderbird into bazaar.conf explicitly it works. [20:42] pickscrape, hrm, that ight be a bug [20:42] In the docs I see mention of this helping with thunderbird 1.5, but I'm running 2. [20:42] Anything I can do to help debug it? [20:42] you have xdg set to use thunderbird, and it doesn't attach the patch unless you specify it in bazaar.conf> [20:42] ? [20:43] brb [20:43] It only works if I specify thunderbird in bazaar.conf. If I explicitly set xdg-email in bazaar.conf it still doesn't work. [20:45] Confirmed that this workaround works on both machines. [20:45] They're not even the same distro either (1.4 is on gentoo, 1.5 is on Hardy) [20:51] I just created a patch using bzr: bzr diff. How do I apply the diff/patch to another bzr branch? === bpeterson is now known as bpeterson_away === bpeterson_away is now known as bpeterson