[00:30] <Azendale> I have a directory that I ran bzr init in and since have made quite a few commits. Now I need to make a branch (I think that's the right word) of that directory (I'm making changes that may break it). From what I found on the web, you need a repository to do that?
[00:30] <Azendale> If so, how do I change my directory into a repository?
[00:31] <thumper> Azendale: if you ran bzr init, then that director is now a branch
[00:35] <Azendale> So, I guess I'm trying to make a branch of a branch? Is there a way to do that?
[00:35] <thumper> yes
[00:35] <thumper> bzr branch
[00:36] <thumper> however, what are you actually trying to do?
[00:38] <Azendale> Mostly, have two different versions of the same thing. One with a feature and one without. Somewhere down the road maybe be able to take some improvements/changes from the plain version and add them to the extra feature version
[00:44] <Azendale> Maybe I don't totally understand how having different versions of the same thing work. Do you just switch versions and the directory gets changed, just like when you do a bzr revert?
[00:51] <Azendale> Ok, I think I just figured it out. You do bzr branch and you get a second directory with the different version.
[05:35] <kees> jelmer: saaay, is there an upload planned for quantal? LP: #963769 has bit me there and now bzr is useless on my non-auth chroots
[05:35] <kees> (i.e. over http)
[05:38] <spm> heya kees
[05:42] <kees> hi spm! :)
[08:42] <jelmer> kees: I was planning on doing another upload once beta2 is released
[09:51] <jelmer> vila: what are your plans for 2.6 wrt quantal? should we just ship a beta?
[09:52] <vila> jelmer: quantal should get 2.6b1 as it has already been released
[09:53] <jelmer> vila: it already has b1, though there are some fixes in trunk that would be relevant too (see kees' messages from earlier this morning)
[09:53] <vila> oh, yeah, sry misread rmadison
[09:54] <vila> so yeah, 2.6b2 needs to be released, https://launchpad.net/bzr/+milestone/2.6b2 reveals a few bugs that need to be either fix released or retargeted
[09:55] <jelmer> vila: Should we do a proper 2.6.0 (with fewer betas) or just ship a beta with quantal?
[09:55] <vila> I'd say betas for now and a proper 2.6.0 in due time
[09:55] <jelmer> vila: in due time being before quantal is released, or after that?
[09:56] <vila> before
[09:56] <vila> like we did for other 2.x.0
[09:57] <jelmer> vila: okay, works for me :)
[13:18] <mgz> afternoon
[13:19] <jelmer> it most certainly is
[13:36] <ggherdov> Hi all, trying to get the extmerge plugin working on my bzr 2.1; it shows up nicely if I do "bzr plugins", but then "bzr extmerge" gives an error. details here http://bpaste.net/show/S5oCeADfMNiQheflCc2v/ . Any gotcha ?
[13:37] <ggherdov> I installed it just wget-ing the two py files into $HOME/.bazaar/ from http://bazaar.launchpad.net/~zindar/bzr-extmerge/trunk/files
[13:38] <ggherdov> $HOME/.bazaar/plugins/ I meant
[13:38] <jelmer> ggherdov: they should be in a extmerge directory
[13:38] <jelmer> ggherdov: rather than directly in ~/.bazaar/plugins
[13:39] <ggherdov> jelmer: ah that makes sense :-) thanks a lot, trying it.
[14:46] <kees> jelmer: okay. it'd be nice to get it in asap since not having bzr is breaking all my regression testing runs on quantal currently
[14:50] <jelmer> kees: I guess we could do another upload to fix just this, though ideally I'd just pull it in with the next beta
[14:50] <jelmer> vila: still there?
[14:50] <vila> yup
[14:50] <jelmer> vila: what sort of timeframe do you have in mind for b2?
[14:51] <vila> let's talk about releasing 2.6b2 during tomorrow standup
[14:51] <jelmer> okay
[14:51] <vila> and if we agree, I can freeze it tomorrow
[15:06] <kees> jelmer: I can go either way. other people are running regression tests too, so I can wait. :P
[15:26] <jelmer> vila, mgz, jam: https://code.launchpad.net/~jelmer/bzr-gtk/remove-bzr-notify/+merge/113990
[15:27] <vila> hey ! I'm using that !
[15:28] <jelmer> vila: really?
[15:28] <vila> yeah and I don't have trouble with it
[15:28] <jelmer> vila: it's causing various issues for ubuntu users who just happen to have bzr-gtk installed
[15:28] <vila> There was thatn shadow window stuff I encounter once or twice but never to the point I could really reproduce and adiagnose
[15:28] <jelmer> it hasn't worked for me in a long time
[15:28] <vila> Can't you just disable it ?
[15:28] <vila> really ?
[15:29] <vila> what is broken ?
[15:29] <jelmer> anyway, if you think we should keep it then we should at least disable it by default I think
[15:30] <vila> yeah, disabling sounds better
[15:30] <jelmer> vila: what do you use it for though? it only notifies about local stuff these days anymore, unless you have somehow fixed bzr-avahi (and have somebody else that uses it too nearby?)
[15:31] <vila> for now I use it for local commits indeed
[15:31] <jelmer> vila: it just notifies for commit though, how is that useful? you're the one doing the commits :)
[15:31] <vila> come to think of it, it works on my laptop but not my desktop
[15:32] <vila> it also gives feedback when I'm updating
[15:32] <jelmer> ah, okay
[15:36] <jelmer> okay, let's disable it by default then
[15:55] <jelmer> vila: any chance you can follow up to say you're still using bzr-notify on that mp?
[15:55] <jelmer> Curtis just replied to it to
[15:55] <jelmer> *too
[15:56] <vila> yup just refreshed the page to do so and saw curtis answer
[15:57] <vila> done
[15:59] <jelmer> vila: replied :)
[16:01] <jelmer> vila: reconsidering, we have a limited capacity for maintenance and bzr-notify in particular seems to require quite a bit
[16:02] <jelmer> if it's going to blow up for this many users, I think we should either fix it or get rid of it completely
[16:03] <vila> if it's disabled by default why should it blow ?
[16:03] <vila> gtg, up to you, bbl
[16:03] <jelmer> vila: it will still blow for those people who attempt to use it
[16:04] <vila> this logic is flawed: you're implying that code that doesn't run everywhere should be removed
[16:05] <jelmer> vila: I'm implying that it breaks for a large number of people, and as such does more harm than good
[16:06] <jelmer> new users who try it out will be disappointed, and we don't really have the capacity to fix this
[16:07] <jelmer> combined with the fact that bzr-notify isn't particularly useful in the first place, especially now that bzr-avahi is broken
[16:08] <jelmer> the other thing is that it is the main (only?) thin that uses bzr-dbus
[16:08] <jelmer> *thing