| *** Pali has quit IRC | 00:05 | |
| *** dhbiker has quit IRC | 00:15 | |
| *** nox- has joined #maemo-ssu | 00:26 | |
| *** arcean has joined #maemo-ssu | 00:32 | |
| *** Vlad_on_the_road has quit IRC | 00:50 | |
| *** zeq has joined #maemo-ssu | 01:11 | |
| luf | merlin1991: are you still here around? | 01:13 |
|---|---|---|
| merlin1991 | luf: yep | 01:15 |
| luf | https://gitorious.org/keepassx/keepassx/merge_requests/22 | 01:18 |
| luf | merlin1991: Do you have any idea why the merge aslo includes the upstream patches? | 01:18 |
| merlin1991 | hm? | 01:19 |
| luf | merlin1991: (e.g src/CMakeLists.txt(4 / 1), src/core/PasswordGenerator.*) | 01:20 |
| luf | merlin1991: I created clone of keepassx.git to keepassx-n900.git made some changes and created merge request for upstream on gitorious. | 01:20 |
| merlin1991 | the merge request only contains your changes and the merge commit | 01:21 |
| luf | After that there were some upstream changes. I merged them into keepassx-n900 and update the merge request (for upstream). And the changes from upstream are also in the merge request (no idea why). | 01:21 |
| merlin1991 | which is to be expected | 01:21 |
| merlin1991 | and the gitorious ui is silly | 01:22 |
| merlin1991 | but you see from the list of commits, that it's only your chagnes and the merge, nothing else | 01:22 |
| luf | So it's just strange gitorious UI that it shows files I never touched (like src/CMakeLists.txt, PasswordGenerator.*, ...) ? | 01:24 |
| luf | These files I merged from upstream new commits to keepassx-n900. | 01:24 |
| luf | I expected that only differences between upstream keepassx.git and keepassx-n900.git will be shown in the merge. | 01:25 |
| merlin1991 | yeah I'm pretty sure it's gitorious going mental | 01:26 |
| *** xes has quit IRC | 01:28 | |
| luf | Strange. I see non-touched files also in git diff HEAD~1 (in keepassx-n900). So it seems for git the merge contains all the changes but log was added properly from upstream. | 01:29 |
| luf | Maybe that's why I have troubles to understand git :) | 01:29 |
| luf | Never mind I'm going to sleep. | 01:30 |
| merlin1991 | luf it makes sense for git diff aswell | 01:30 |
| merlin1991 | because HEAD is after the merge | 01:30 |
| merlin1991 | and HEAD~1 is before the merge | 01:31 |
| merlin1991 | that the merge is made up of several commits does not play into this | 01:31 |
| *** M4rtinK has quit IRC | 01:31 | |
| luf | merlin1991: Yeah but the git log doesn't correspond to the diff ~N. | 01:31 |
| merlin1991 | that's because git loves to play mind games with you ;) | 01:32 |
| luf | merlin1991: exactly ! :D | 01:32 |
| *** nightsh has quit IRC | 01:52 | |
| *** nightsh has joined #maemo-ssu | 01:55 | |
| *** luf has quit IRC | 02:03 | |
| *** LaoLang_cool has joined #maemo-ssu | 02:04 | |
| *** kolp has quit IRC | 03:00 | |
| *** _LauRoman has joined #maemo-ssu | 03:03 | |
| *** LauRoman has quit IRC | 03:04 | |
| *** guly has quit IRC | 03:20 | |
| *** arcean has quit IRC | 03:35 | |
| *** _LauRoman has quit IRC | 04:22 | |
| *** nox- has quit IRC | 04:39 | |
| *** Martix has quit IRC | 04:40 | |
| *** amiconn has quit IRC | 05:21 | |
| *** amiconn_ has joined #maemo-ssu | 05:21 | |
| *** amiconn_ is now known as amiconn | 05:21 | |
| *** guly has joined #maemo-ssu | 05:36 | |
| *** DocScrutinizer05 has quit IRC | 06:03 | |
| *** DocScrutinizer05 has joined #maemo-ssu | 06:03 | |
| *** zeq has quit IRC | 07:04 | |
| *** M13 has joined #maemo-ssu | 07:15 | |
| *** Pali has joined #maemo-ssu | 08:44 | |
| *** Pali has quit IRC | 09:16 | |
| *** M13 has quit IRC | 11:26 | |
| *** M4rtinK has joined #maemo-ssu | 11:30 | |
| *** futpib has joined #maemo-ssu | 11:40 | |
| *** LauRoman has joined #maemo-ssu | 11:44 | |
| DocScrutinizer05 | ~seen pali | 11:57 |
| infobot | pali <~pali@Maemo/community/contributor/Pali> was last seen on IRC in channel #maemo, 2h 46m ago, saying: 'going offline, bye'. | 11:57 |
| DocScrutinizer05 | *sigh* | 11:57 |
| *** lizardo has joined #maemo-ssu | 12:34 | |
| *** unclouded has quit IRC | 12:50 | |
| *** Martix has joined #maemo-ssu | 12:50 | |
| *** tom_ has quit IRC | 13:02 | |
| *** arcean has joined #maemo-ssu | 13:32 | |
| *** Martix has quit IRC | 13:56 | |
| *** Martix has joined #maemo-ssu | 14:24 | |
| *** Martix_ has joined #maemo-ssu | 14:26 | |
| *** Martix has quit IRC | 14:30 | |
| *** LauRoman has quit IRC | 14:36 | |
| *** Martix_ is now known as Martix | 15:21 | |
| *** arcean_ has joined #maemo-ssu | 16:02 | |
| *** arcean has quit IRC | 16:04 | |
| *** andre__ has quit IRC | 16:08 | |
| *** tom____ has joined #maemo-ssu | 16:09 | |
| *** zeq has joined #maemo-ssu | 16:09 | |
| *** LauRoman has joined #maemo-ssu | 16:11 | |
| *** Martix has quit IRC | 16:18 | |
| *** Martix has joined #maemo-ssu | 16:22 | |
| freemangordon | merlin1991: now the repos are up, what about pushing 7.2, including glibc? | 16:56 |
| *** LauRoman has quit IRC | 16:58 | |
| *** LauRoman has joined #maemo-ssu | 17:11 | |
| *** arcean_ is now known as arcean | 17:25 | |
| freemangordon | [GENERAL NOTICE] pixman 0.28.2 is in cssu-devel, please test | 18:05 |
| *** Martix has quit IRC | 18:17 | |
| *** Martix has joined #maemo-ssu | 18:17 | |
| *** Pali has joined #maemo-ssu | 18:22 | |
| *** BCMM has joined #maemo-ssu | 18:35 | |
| *** Pali has quit IRC | 18:35 | |
| *** NIN101 has joined #maemo-ssu | 19:00 | |
| freemangordon | arcean: set phone rotation to auto, open phone app, go to tasknav, hold in portrait and ope the kbd | 19:02 |
| freemangordon | I can bet I had fixed that an year or so ago | 19:02 |
| freemangordon | though may be i am wrong at was always like that | 19:03 |
| freemangordon | hildon-desktop in cssu-devel is that | 19:03 |
| freemangordon | arcean: IIUC thumbnails should not rotate before the desktop is rotated | 19:04 |
| *** M13 has joined #maemo-ssu | 19:13 | |
| *** zeq has quit IRC | 19:43 | |
| *** BCMM_ has joined #maemo-ssu | 20:01 | |
| *** LauRoman has quit IRC | 20:07 | |
| *** Martix has quit IRC | 20:08 | |
| *** LauRoman has joined #maemo-ssu | 20:10 | |
| *** toxaris has joined #maemo-ssu | 21:10 | |
| *** sv has joined #maemo-ssu | 21:46 | |
| *** discopig has quit IRC | 21:48 | |
| arcean | freemangordon: phone app listens to mce, so sometimes it behaves quite strange | 22:03 |
| *** sv is now known as discopig | 22:19 | |
| *** futpib has quit IRC | 22:23 | |
| *** _rd has joined #maemo-ssu | 22:55 | |
| *** xes has joined #maemo-ssu | 22:55 | |
| *** lizardo has quit IRC | 22:59 | |
| *** unclouded has joined #maemo-ssu | 23:18 | |
| *** BCMM has quit IRC | 23:21 | |
| *** freemangordon has quit IRC | 23:25 | |
| *** freemangordon has joined #maemo-ssu | 23:25 | |
| *** Vlad_on_the_road has joined #maemo-ssu | 23:31 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!