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