[01:07] anyone know how to fix http://pastebin.com/haeK7p0J? I'm on mac if it helps... [01:07] but it's more of a key error I guess [02:10] anyone? I can't even checkout branches on my computer because of this key error and I gave launchpad my ssh public key that I generated.... [02:11] lets see [02:12] milleja46: check you have the right username [02:12] I should....because I use the same username on launchpad... [02:15] yea same id I set on bzr as my launchpad-login is listed under my profile on launchpad.... [02:19] you might try ssh-add [02:19] check that ssh can see the identity [02:21] how would I check with that command? [02:39] well too bad he's gone I was going to thank him for his help >_< === lifeless_ is now known as lifeless === bradm_ is now known as bradm [08:01] morning! [08:08] morning mgz [08:08] how's bzr-2.5 coming today? [08:36] hi mgz, jam [08:36] jam: So, db-devel-bzr-2.5.1 ran through ec2 successfully yesterday [08:36] great [08:36] jam: so I'm hoping to get it cowboyed on staging today [08:42] hm, annoying [08:43] mgz: who is? [09:12] :) [11:46] mgz: new try: [11:47] even gazillionier faster? [19:08] Gaaah, stupid can't-resolve freakin conflicts. [19:11] fullermd: which ones, just for my edification? [19:12] Removed directories. They don't go away until you manually type every zarking last one of them in. [19:12] want to know if the branches I have up will solve your pain [19:12] ah, great, they will. [19:12] Or swing the "resolve --all" sledgehammer, but that's WAY too big. [19:12] Oh? That would be nice. [19:12] okay, so, I need to push through the branches I have up, then you can rm -rf then `bzr resolve` [19:12] I was just seeing if I'd filed a bug about it, and I did. 5 years ago. [19:13] not quite the "make `bzr rm` do the right thing" you asked for in the bug, but nearly [19:14] Yeah, that'd be close. [19:14] Actually, this particular case, I'm not sure it should be a conflict anyway. [19:14] Giant directory tree, that was removed. I happened to have a few scraps floating around in it. [19:14] So when I update'd, I got a giant pile of "can't remove dir because it's not empty" conflicts. [19:15] I guess it's not entirely insensible in general for that to be a conflict that sticks around bugging you in stat/etc forever, but it sure is in this case. [19:16] that's the ignored junk/precious problem, which is part of what has gunked people up who wanted to get this fixed [19:16] Well, I dunno. [19:16] I mean, it shouldn't _delete_ the files, sure. [19:17] Or even move them aside, probably. [19:17] And if they were versioned files, deleting the dir absolutely should be a conflict. [19:17] But they weren't. Why is it a conflict that the now-unversioned directory just can't be deleted? [19:19] The junk/precious would be more like a dir becoming versioned, and what to do with the existing unversioned dir of the same name with files in it. [19:20] well, you can set vila's config option I can never remember the name of to move them [19:21] Furrfu. [19:21] Repository checkout (format: 1.9) [19:21] I really should get around to fixing that one of these days... [21:49] so [21:49] has anyone had any luck dpushing to a bitbucket git repo? [21:50] cause i'm getting 'invalid repo syntax' [22:09] now i cant get it to just push to a regular localhost git repo =/ [22:10] so i dunno if oyu are there jelmer [23:13] mgrandi, hi [23:13] mgrandi, still there? [23:14] yeah [23:14] i figured it out, you answered it in a launchpad question thingy [23:14] but i agree its very confusing [23:14] https://answers.launchpad.net/bzr-git/+question/148313 [23:14] ah [23:18] but yeah that should be fixed [23:19] also, i can't seem to dpush to bitbucket, have you had any luck with that? [23:34] mgrandi: dpush doesn't create new branches yet, that's the issue [23:34] mgrandi: I think that should work - how does it fail? [23:34] let me create a separate bitbucket thingy, one sec [23:39] bitbucket responds with 'conq: invalid repository syntax.' [23:42] with git bzr dpush git+ssh://git@bitbucket.org:mgrandi/myscriptstmp.git,branch=master [23:42] i cloned the empty bitbucket git repo, added a file so it created branch master, pushed that to bitbucket, then tried to run that ^ [23:43] mgrandi: that's not a valid URL [23:43] mgrandi: : is used to separate hsot and port [23:44] mgrandi, you want / rather than : there [23:44] thats how bitbucket shows the url [23:45] Clone this repository (size: 580 bytes): HTTPS / SSH / SourceTree [23:45] $ git clone git@bitbucket.org:mgrandi/myscriptstmp.git [23:45] mgrandi: that's not a URL, but a git-specific location specifier [23:45] ah [23:46] git+ssh://git@bitbucket.org/mgrandi/myscriptstmp.git,branch=master [23:46] well i changed it to a slahs, it seemed to work but then it says "bzr: ERROR: The file id "None" is not present in the tree . " [23:46] mgrandi, that's just a bug in dpush from bzr-git I suspect; it's all still experimental [23:47] ok [23:49] it converted it to git at least for the other repo that i cared about, so its all fine and dandy =) [23:59] cool