| bluesabre | rafaellaguna: In case the question is still out there, I'm the xubuntu technical lead | 00:38 |
|---|---|---|
| bluesabre | I hopped on this channel to listen for bugs common to our projects | 00:39 |
| gsilva | hello all | 18:34 |
| gsilva | wxl, does this mean our meeting has been approved? http://summit.ubuntu.com/uos-1505/meeting/22484/community-1505-planning-session/ | 18:58 |
| wxl | yes gsilva ! | 19:52 |
| gsilva | Great :D | 19:53 |
| gsilva | What's next, wxl ? Should we invite all TLs from the mailing list and later invite the users from the users mailing list? | 20:00 |
| wxl | gsilva: yep | 20:00 |
| wxl | gsilva: find the blueprint, too (shoudl be linked) | 20:01 |
| gsilva | okay, done for the TLs. Soon I'll take care of the other part of the task | 20:55 |
| gsilva | wxl, you around? | 22:33 |
| gsilva | or someone comfortable with bazaar | 22:34 |
| ianorlin | I might be why gsilva ? | 22:54 |
| gsilva | ianorlin, in this section of LP (https://code.launchpad.net/lubuntu-manual) I have a branch lp:lubuntu-manual | 22:55 |
| gsilva | and that huge load of stuff to push the code | 22:55 |
| gsilva | how can I fix that to be equal - branch lp:lubuntu-manual and push lp:lubuntu-manual? | 22:56 |
| ianorlin | your local branch ah I haven't figured that out either | 23:02 |
| ianorlin | I think it is bzr merge | 23:02 |
| wxl | gsilva: what up? | 23:12 |
| gsilva | wxl ^ | 23:12 |
| wxl | looking | 23:13 |
| wxl | um hold on | 23:13 |
| wxl | gsilva: give me the output of `bzr info` | 23:15 |
| gsilva | 1 sec | 23:16 |
| gsilva | apologies | 23:33 |
| gsilva | An old friend was provoking me to exchange some tracks | 23:33 |
| gsilva | damn, good ol'days | 23:33 |
| gsilva | wxl, here you go: http://i57.tinypic.com/11il7pi.jpg | 23:36 |
| wxl | gsilva: i see nothing | 23:39 |
| wxl | sends me to http://tinypic.com/view.php?pic=11il7pi&s=8 | 23:39 |
| gsilva | and now? http://i57.tinypic.com/11il7pi.jpg | 23:39 |
| gsilva | w8 | 23:39 |
| gsilva | http://tinypic.com/r/11il7pi/8 | 23:39 |
| gsilva | I think the last one works | 23:40 |
| wxl | "think" | 23:45 |
| wxl | aaaaaaaaaaaand it doesn't | 23:45 |
| wxl | imgur | 23:45 |
| wxl | or pastebin | 23:46 |
| wxl | !pastebin | gsilva | 23:46 |
| ubot93 | gsilva: For posting multi-line texts into the channel, please use http://paste.ubuntu.com | To post !screenshots use http://imgur.com/ !pastebinit to paste directly from command line | Make sure you give us the URL for your paste - see also the channel topic. | 23:46 |
| gsilva | http://imgur.com/qzEOKYl | 23:46 |
| wxl | that looks like how it should | 23:48 |
| wxl | so maybe i don't understand the problem | 23:48 |
| gsilva | The problem is with LP | 23:49 |
| gsilva | (https://code.launchpad.net/lubuntu-manual) | 23:49 |
| gsilva | you have branch lp:lubuntu-manual | 23:49 |
| gsilva | and then push lp:gustavo... | 23:49 |
| gsilva | And I don't want that | 23:49 |
| gsilva | It wasn't like that before but now it is again for some reason :o | 23:50 |
| wxl | what? | 23:50 |
| wxl | hold on and let me log in | 23:50 |
| gsilva | If you go to (https://code.launchpad.net/lubuntu-manual) you have push lp:gustavo bla bla bla | 23:50 |
| gsilva | if you click the code, you have push lp:lubuntu-manual, as it should | 23:50 |
| gsilva | Here: http://prntscr.com/6zqilb | 23:51 |
| gsilva | Clicking the code repo below | 23:51 |
| wxl | well actually i see push lp:wxl… | 23:51 |
| wxl | so it might not be so strange | 23:51 |
| gsilva | http://prntscr.com/6zqiow | 23:51 |
| gsilva | OHH | 23:51 |
| gsilva | Maybe that's in case you want to fork the repo? | 23:51 |
| wxl | perhaps | 23:51 |
| gsilva | You branch the latest one and then push a fork? | 23:51 |
| wxl | the ACTUAL branch is here and it looks right https://code.launchpad.net/~lubuntu-wiki-docs/lubuntu-manual/trunk | 23:52 |
| gsilva | yes, that's correct | 23:52 |
| gsilva | okay, nevermind. I thought it was because of anything poorly configured | 23:52 |
| wxl | cuz honestly, the instructions on the lubuntu-manual page that says to grab lp:lubuntu-manual pulls from the trunk of lubuntu-manual owned by lubuntu-wiki-docs, i.e. https://code.launchpad.net/~lubuntu-wiki-docs/lubuntu-manual/trunk | 23:53 |
| gsilva | yeap | 23:53 |
| gsilva | Nevermind, it's a feature I never worked with before, thus my doubts | 23:54 |
| wxl | np, i understand | 23:54 |
| gsilva | But yea, now that I am thinking of it, if you push to wxl later you'll create another repo | 23:54 |
| gsilva | that's the way to fork a repo probably | 23:54 |
| wxl | well just like github | 23:55 |
| wxl | the way to contribute to a repo that works for everyone regardless of there access to a repo is: | 23:55 |
| gsilva | May be, yeah. Github is simpler to push stuff | 23:55 |
| wxl | 1. branch the code | 23:55 |
| wxl | 2. make changes | 23:55 |
| wxl | 3. push the code to your repo | 23:56 |
| wxl | 4. request a review | 23:56 |
| wxl | 5. upon successful review, code is merged from your repo to the main repo | 23:56 |
| wxl | in github, it's actually very simple: | 23:57 |
| wxl | 1. fork the code | 23:57 |
| wxl | 2. make changes | 23:57 |
| wxl | 3. push the code to your fork | 23:57 |
| wxl | 4. issue a pull request | 23:57 |
| wxl | 5. upon approved request, code is merged from your fork to the main repo | 23:57 |
| wxl | so it's actually not any easier ;) | 23:57 |
| gsilva | I meant easier to push things | 23:58 |
| gsilva | because you don't need to specify the location, as long as you are within the repo you want to work with | 23:58 |
| wxl | not true actually | 23:58 |
| gsilva | Like, you branch, do changes and git push automatically sends it to the origin where you branched it first | 23:58 |
| gsilva | unless, ofc, you want a specific location | 23:58 |
| wxl | on the other hand you NEED to host a separate codebase online with github | 23:59 |
| wxl | you do not need to do that with lp | 23:59 |
| gsilva | true | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
