[00:24] hey guys, how am I supposed to merge two branchs that are in an MP? [00:24] I see no button [00:35] jose: You need to merge with bzr on your local machine (to resolve conflicts, for example) [00:36] wgrant: any idea on how should I? [00:36] * jose is a bit lost, bzr merge doesn't do anything [00:37] jose: Inside the target branch, run 'bzr merge lp:~path/to/branch/to/merge' [00:44] thanks! [00:46] wgrant: huh, still, 'nothing to do' shows up [00:46] I'm trying to merge https://code.launchpad.net/~jose/kubuntu-website/feature-tour-update/+merge/199881 [00:46] jose: which MP is this? [00:46] ^ [00:49] jose: Are you sure you're merging the right way? [00:49] erm, huh? [00:50] In the branch you're merging *into*, run 'bzr merge lp:~path/to/branch/to/merge/FROM' [00:50] oooooh [00:50] It sounds like you're running it in the opposite direction [00:50] yeah, I was doing exactly that :P === Logan_ is now known as Guest18452 === Logan__ is now known as Logan_ === Logan__ is now known as Logan_ === Ursinha is now known as Ursinha-afk [04:01] hi I got an issue trying to login into launchpad from the command line [04:01] I do, bzr branch lp: and get the following [04:01] Permission denied (publickey). [04:02] I already put my public key which is my default key, but in case is not the default, is there a flag I can put to assign the key I am using? [04:05] I already put my key up [04:22] JZA: What's your Launchpad username? [04:22] jzarecta [04:22] I paste my ssh pub on my profile [04:22] however I am unsure which passphrase is it asking me now [04:23] What does 'ssh -v jzarecta@bazaar.launchpad.net' say? [04:24] ok it does authenticate me [04:24] debug1: Authentication succeeded (publickey). [04:24] OK, so it sounds like bzr doesn't know your Launchpad username [04:24] What does ' [04:24] 'bzr lp-login' say? [04:25] bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/%2Bbranch/openobject-doc/". [04:25] I see an issue on the URL [04:25] could that be the problem? [04:25] it says my nick, jzarecta [04:26] What output does 'ssh jzarecta@bazaar.launchpad.net' give? [04:26] Without -v [04:35] No shells on this server. [04:36] JZA: Right, so that's working fine. What about 'bzr ping bzr+ssh://bazaar.launchpad.net/'? [04:37] bzr: ERROR: unknown command "ping" [04:38] JZA: Does 'bzr branch lp:openobject-doc' still gives the "Permission denied (publickey)" error? [04:39] no, just gives bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/%2Bbranch/openobject-doc/". [04:39] JZA: OK, so you did something to fix the problem. [04:40] JZA: Perhaps you did something to your ssh-agent [04:40] I said, I added the custom key to my .ssh/config [04:40] so it goes to the one I uploaded [04:40] The new error is because lp:openobject-doc doesn't name a branch. [04:40] but still not working :( [04:40] What were you attempting to retrieve? [04:40] The URL you specified doesn't exist. [04:42] yeah according to the documentation, tis is the branch I need to pull [04:42] https://doc.openerp.com/contribute/09_documentation_translation.html/ [04:42] guess the project name has changed. [04:42] The project still exists at https://code.staging.launchpad.net/openobject-doc, but it has no trunk branch set. [04:42] https://code.launchpad.net/openobject-doc [04:43] I see [04:43] Er, without .staging, oops [04:43] Your URL is correct [04:43] You can see the 7.0, 6.1 etc. branches listed there. [04:43] But no lp:openobject-doc [04:45] I see, I am poking around, I left a question, hopefully someone wil reply with the correct instructions. [04:46] at least I can say is not a lp or key issue. [04:47] Yeah, it's just out of date docs, it seems. [14:26] Hello, is there something wrong with uploads to PPA ? [14:27] are you getting an error? [14:27] hmm, sorry [14:27] I think I am mistaked [14:28] mistaken [17:49] heydiho. I am using launchpad for translating my oss project (yaxim), and I needed to make a search&replace over the whole strings set. I downloaded a tarball, replaced the strings, and re-uploaded the tarball. But now, I need to manually assign each .po file from the tarball the right language in https://translations.launchpad.net/yaxim/master/+imports [17:49] is there a way to get that automatically? [17:51] would it work better if I strip yaxim- from the .po file names? [17:52] no, it won't :( [17:54] is there any way to automate the translation import queue? [18:12] anyone from the translations team? [18:26] ok, now I clicked through all 19 of them. [21:01] hmm, http://bazaar.launchpad.net/~vcs-imports/emacs/trunk/files is not working for me ...