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