[04:00] <meoblast001> hi
[04:00] <meoblast001> i can't seem to find the command to change my email
[04:01] <meoblast001> nvm
[04:04] <meoblast001> why do all my commits i made on my desktop say branch nick is "trunk" while the one i just made on my desktop says "nitrobot-plugins"
[04:05] <meoblast001> i actually copied the directory from my desktop, so this makes no sense unless different bazaar versions do things differently
[04:09] <poolie> we fixed a bug a while ago todo with calculating the nick from the branch directory not the checkout
[04:09] <poolie> so that might be it
[04:10] <meoblast001> so i need to upgrade my bazaar version?
[04:10] <meoblast001> yuck, i'm using an ugly 9.04 version
[04:10] <poolie> well, i think you can just set the nick directly if you want
[04:20] <meoblast001> poolie: i just installed 2.1.0 but i still get 1.13.1 on a bzr --version
[04:20] <poolie> i guess you have it installed in home or something
[04:20] <poolie> try 'which bzr'
[04:20] <meoblast001> sudo python setup.py instal
[04:20] <meoblast001> /usr/local/bin/bzr
[04:25] <meoblast001> i'll just remove my system version from APT
[04:26] <meoblast001> hm, now it won't look in /usr/local/bin
[04:27] <meoblast001> ah, it was that one shell
[04:27] <meoblast001> ok, should be good now
[04:28] <meoblast001> poolie: still says "nitrobot-plugins"
[04:30] <meoblast001> poolie: should i just do bzr nick manually because voodoo magic changed my branch name?
[04:30] <poolie> perhaps that's the simplest way out
[04:31] <poolie> you could look in .bzr/branch
[04:31] <meoblast001> will it do anything strange to my branch?
[04:31] <poolie> i can't remember if it's a specific nick file or in the branch config
[04:31] <poolie> no
[04:31] <meoblast001> ok
[04:31] <meoblast001> .bzr/branch is a directory
[04:33] <meoblast001> oh no, panic attack
[04:34] <meoblast001> this makes no sense
[04:34] <meoblast001> it keeps saying that the branch name is the directory name
[04:34] <meoblast001> that's a lie, it's always been trunk, and i don't know why
[04:34] <meoblast001> i need consistancy
[04:37] <meoblast001> poolie: everything i branch refuses to use the branch name "trunk"
[04:37] <meoblast001> it now wants to use the directory name
[04:38] <poolie> meoblast001: if you say 'bzr nick FOO' it should use that on all new commits
[04:38] <poolie> no?
[04:38] <meoblast001> sure, but i never had to do this in the past, and the question "why?" still sticks in my head
[04:39] <meoblast001> on my desktop, i always just branched, worked, committed
[04:39] <meoblast001> and it was always consistant
[04:43] <poolie> i'm not sure what you're doing differently
[04:44] <meoblast001> poolie: absolutely nothing
[04:44] <poolie> actually the normal behaviour is to use the directory name of the branch
[04:44] <poolie> not sure why it was always saying trunk before
[04:44] <meoblast001> so why did it ever use trunk?
[04:44] <meoblast001> i don't want to rebase this whole thing
[04:44] <meoblast001> jeez, what ever happened to consistency
[04:45] <meoblast001> ok, looks like i'm using a new branch name until something else screws up and it switches back
[04:45] <poolie> perhaps you're mixing branches on one machine and checkouts on another?
[04:46] <meoblast001> ?
[04:46] <poolie> that could account for the difference in behaviour
[04:49] <meoblast001> poolie: sorry, i'm sort of an idiot when it comes to a lot of this stuff
[04:49] <meoblast001> what are you trying to say i could have done wrong?
[04:50] <poolie> np, i'm just trying to guess at what might have changed
[04:50] <poolie> if you were using checkouts or bound branches in one place and branches in the other
[04:50] <meoblast001> well, let me explain the history of this directory
[04:50] <meoblast001> this was a branch on my old system
[04:50] <poolie> that could explain teh difference
[04:50] <meoblast001> when my system got hosed, i copied over a bunch of directories to my laptop, including those
[04:51] <meoblast001> i started working on those same directories, just on a different system
[04:51] <meoblast001> oh no, more panic
[04:52] <meoblast001> i guess i should just accept the new branch name, and scream at my desktop when it tries to use "trunk" again?
[04:52] <poolie> well
[04:52] <poolie> what is this branch supposed to be?
[04:52] <meoblast001> it's too late now, i already have 2 commits with the non-trunk name on one of my projects
[04:52] <poolie> the idea of recording the branch nick is to give you a reminder of the context in which the commit was made
[04:52] <meoblast001> you can't uncommit and recommit more than 1 commit cleanly
[04:52] <poolie> aside from that it doesn't matter
[04:52] <poolie> it's only informative
[04:53] <poolie> so personally i wouldn't bother rebasing if it was slightly wrong
[04:53] <meoblast001> it was just the sole branch for these projects
[04:53] <poolie> so... these commits that were on the non-trunk branch, what name did they get?
[04:53] <meoblast001> citrine for citrine/
[04:53] <meoblast001> nitrobot-plugins for nitrobot-plugins/
[04:54] <poolie> and you wanted them to both be 'trunk' because they're the trunk of those respective projects?
[04:55] <meoblast001> no, i wanted them to both be 'trunk' because that's what it's always been
[04:55] <meoblast001> and i have no logical reason for why it changed it
[04:55] <meoblast001> what's going to stop another machine from renaming it back to trunk?
[04:57] <poolie> could it be that previously you had the branch in citrine/trunk and now it's just in 'citrine'?
[04:57] <meoblast001> never had a directory named trunk/
[04:57] <meoblast001> not even on my server
[04:58] <poolie> hm
[04:59] <poolie> that's a real puzzle then
[04:59] <poolie> bzr should only use a name that you explicitly give it or that comes from the directory name
[04:59] <poolie> i think you can feel safe that it won't just randomly change
[04:59] <meoblast001> poolie: hm, thing is, the server always recognized it as the directory name
[05:00] <poolie> how do you mean 'recognized it'?
[05:00] <meoblast001> i wrote a hook that passes information from Bazaar to my IRC bot to print
[05:00] <poolie> ah using branch.get_nick()
[05:00] <meoblast001> it passes the branch name, the committer, the commit number, and the commit message
[05:00] <meoblast001> result.branch.nick
[05:03] <meoblast001> poolie: should i just accept the new change and only consider it a problem if something tries to change it back?
[05:06] <meoblast001> poolie: you did say using the directory name is the default behavior, right?
[05:06] <poolie> i think you should just accept it; and yes
[05:06] <meoblast001> ok
[05:16] <meoblast001> poolie: thanks
=== TheMonkey is now known as ElMonkey
[09:41] <wgrant> bzr: ERROR: bzrlib.errors.InvalidEntryName: Invalid entry name: '\
[09:42] <wgrant> Is there any way to solve that when branching from a git repo with bzr-git?
[09:44] <james_w> wgrant: not currently I believe
[09:44] <wgrant> Damn.
=== Viper-7 is now known as Viper-17\
=== Viper-17\ is now known as Viper-17
=== Viper-17 is now known as Viper-7
[14:55] <Peng_> Loggerhead has segfaulted twice since I upgraded bzr from r5120 to 5193. This can't be good.
[14:55] <fullermd> It doesn't like odd numbers.
=== blueyed_ is now known as blueyed
[15:14] <Peng_> Ugh, that's what I get for only pulling it once a month: a huge regression range.
[15:15] <Peng_> Wait a minute. None of the C bits have even changed!
[15:16]  * Peng_ bangs head on wall
[15:18] <fullermd> Obviously, then, the change must be in the unCeen!
[15:35] <parthm> hello, i am looking at hydrazine, capture-bug-counts. so for the first time, whats a good default for launchpad access on the auth page? "change anything"?
[15:52] <parthm> nevermind. I went with "read only". worked well :)
[19:02] <cbz> jelmer: does pushing bzr renames into subversion track them as subversion renames?
=== radoe_ is now known as radoe
[20:20] <jelmer> cbz: svn doesn't support renames, but it will do a copy + delete
[20:22] <mhall119> hi, how do I get a log with gpg signature info?
[20:22] <jelmer> mhall119: as far as I know we don't have a way to do that yet. bzr-gtk can display gpg information though
[20:23] <mhall119> hmmm, I need to send it to a professor
[20:24] <mhall119> and I doubt he'll be willing to learn enough bzr to find it from the repo himself
[20:24] <mhall119> also, bzr viz shows that it's signed, but can't find a key to verify with
[20:25] <mhall119> I signed it using my personal private key
[20:25] <mhall119> why wouldn't it be able to use my personal public key?