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