| *** alga has quit IRC | 00:09 | |
| *** alga has joined #schooltool | 00:25 | |
| *** alga has quit IRC | 01:43 | |
| *** alga has joined #schooltool | 01:44 | |
| *** menesis has quit IRC | 01:52 | |
| replaceafill | wow! trunks are fully translated to khmer! | 02:31 |
|---|---|---|
| th1a | Those guys don't play. | 02:31 |
| replaceafill | :D | 02:31 |
| replaceafill | it seems like your nagging worked | 02:31 |
| replaceafill | they were updated right after your mail about 'we're going to stop working...' | 02:32 |
| th1a | They've got a lot more translating experience than working with schools experience. | 02:33 |
| replaceafill | it seems like the ubuntu font works well with khmer | 02:34 |
| replaceafill | although i dont understand a thing... :( | 02:34 |
| th1a | They've got a khmer ubuntu font? | 02:34 |
| replaceafill | or maybe i'm misunderstanding my browser... | 02:35 |
| th1a | They are working on a lot of character sets. | 02:35 |
| *** th1a has quit IRC | 03:09 | |
| *** alga has quit IRC | 04:45 | |
| replaceafill | aelkner, u there? | 06:38 |
| *** replaceafill has quit IRC | 07:22 | |
| *** menesis has joined #schooltool | 11:00 | |
| *** alga has joined #schooltool | 11:26 | |
| *** menesis has quit IRC | 12:49 | |
| *** ignas has joined #schooltool | 13:27 | |
| *** menesis has joined #schooltool | 14:03 | |
| *** ignas_ has joined #schooltool | 14:14 | |
| *** ignas_ has quit IRC | 14:45 | |
| *** replaceafill has joined #schooltool | 16:23 | |
| *** th1a has joined #schooltool | 17:32 | |
| *** ignas has quit IRC | 19:24 | |
| aelkner | replaceafill, ayt? | 19:58 |
| replaceafill | aelkner, yes | 19:58 |
| replaceafill | last night i just wanted to propose what yvl did in his mail today :) | 19:59 |
| replaceafill | well, use of select widgets like http://img51.imageshack.us/img51/278/pantallazoci.png | 19:59 |
| replaceafill | menesis, could you take a look at https://code.launchpad.net/~replaceafill/schooltool.gradebook/split_ftests/+merge/45421 when you have some time? :) | 20:01 |
| aelkner | replaceafill, thatnks | 20:02 |
| aelkner | fsufitch, ayt? | 20:03 |
| menesis | replaceafill: I was looking at your branch yesterday, and merged part of it. | 20:17 |
| replaceafill | ah yes, the bug fix, thanks | 20:17 |
| menesis | I see you consolidated all checkins into one. Good. | 20:17 |
| replaceafill | :D | 20:17 |
| replaceafill | i'm learning :P | 20:18 |
| menesis | no, you just merged. didn't need to do that | 20:24 |
| menesis | ok I pushed that branch to trunk | 20:25 |
| replaceafill | oh no | 20:25 |
| replaceafill | i pulled trunk and merged my branch to it | 20:25 |
| * replaceafill goes to check bzr docs again :( | 20:25 | |
| replaceafill | thanks menesis | 20:26 |
| menesis | :) | 20:27 |
| menesis | you did not need to merge you branch, because that's what I do :) | 20:29 |
| menesis | to the latest trunk I mean | 20:29 |
| replaceafill | but how do i consolidate my multiple commits? | 20:29 |
| menesis | the branches do not have to be up to date | 20:30 |
| menesis | I merged your gradebook branch in parts anyway | 20:30 |
| replaceafill | ah | 20:30 |
| menesis | `bzr merge -r 210` to merge up to rev 210, etc. | 20:31 |
| menesis | in this case, because each commit just adds one file | 20:31 |
| menesis | you can uncommit all such changes | 20:32 |
| menesis | and commit as one | 20:32 |
| replaceafill | you can uncommit?!?!? | 20:32 |
| replaceafill | Purpose: Remove the last committed revision | 20:33 |
| replaceafill | wow | 20:33 |
| menesis | also, use bzr shelve -m 'add collator' src/schooltool/gradebook/browser/gradebook.py | 20:34 |
| menesis | to separate an unrelated change | 20:34 |
| menesis | commit the split ftests | 20:34 |
| menesis | bzr unshelve | 20:34 |
| menesis | and commit the collator change | 20:34 |
| Lumiere_ | menesis: I assume that works until you merge? | 20:34 |
| replaceafill | man, i didnt know any of those :( | 20:34 |
| menesis | Lumiere_: what works? | 20:35 |
| Lumiere_ | uncommit | 20:35 |
| *** Lumiere_ is now known as Lumiere | 20:35 | |
| *** Lumiere has quit IRC | 20:35 | |
| *** Lumiere has joined #schooltool | 20:35 | |
| menesis | if you get a branch from somewhere and uncommit, you cannot push back or merge because that revision id is lost | 20:36 |
| menesis | but if you work on your own branch (not checkout), you can do with it what you please, before you propose a merge | 20:36 |
| replaceafill | so i can do branch trunk, make 6 commits, and before propose the merge, uncommit the 6 commits and make a single commit? | 20:37 |
| menesis | yes! | 20:37 |
| replaceafill | man, lots of commits in that sentence | 20:37 |
| replaceafill | nice! will try that next time ;) | 20:38 |
| menesis | also bzr shelve/unshelve are very useful | 20:38 |
| replaceafill | Purpose: Temporarily set aside some changes from the current tree. | 20:38 |
| replaceafill | lol, put changes in a shelve! | 20:38 |
| replaceafill | s/in/on | 20:39 |
| menesis | bzr replay/rebase as well if you have several branches. but those are more complicated (bzr-rewrite plugin) | 20:39 |
| replaceafill | out of the way, until a later time | 20:39 |
| menesis | then there is also bzr-loom, and bzr-pipeline, but that's way too complicated even for me | 20:39 |
| replaceafill | :D | 20:39 |
| menesis | ok I have to go, have a good day guys :) | 20:40 |
| replaceafill | thanks again menesis | 20:41 |
| *** menesis has quit IRC | 20:45 | |
| *** menesis has joined #schooltool | 22:57 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!
