| *** Timmo_ has quit IRC | 00:03 | |
| *** Timmo_ has joined #maemo-ssu | 00:04 | |
| *** NIN101 has quit IRC | 00:07 | |
| *** arcean_ is now known as arcean | 00:08 | |
| *** _rd has quit IRC | 00:30 | |
| *** xes has quit IRC | 00:36 | |
| *** arcean has quit IRC | 01:18 | |
| *** arcean has joined #maemo-ssu | 01:20 | |
| *** kolp has quit IRC | 01:36 | |
| *** Jaded has joined #maemo-ssu | 02:20 | |
| *** Jaded has joined #maemo-ssu | 02:20 | |
| *** Jade has quit IRC | 02:23 | |
| *** Jaded is now known as jade | 02:30 | |
| *** Martix_ has quit IRC | 02:53 | |
| *** amiconn has quit IRC | 03:32 | |
| *** amiconn has joined #maemo-ssu | 03:32 | |
| *** Timmo_ has quit IRC | 03:34 | |
| *** wmarone has quit IRC | 03:45 | |
| *** wmarone has joined #maemo-ssu | 03:46 | |
| *** arcean has quit IRC | 04:13 | |
| *** nox- has quit IRC | 04:18 | |
| *** Jaded has joined #maemo-ssu | 05:19 | |
| *** Jaded has joined #maemo-ssu | 05:19 | |
| *** jade has quit IRC | 05:22 | |
| *** amiconn_ has joined #maemo-ssu | 05:30 | |
| *** amiconn has quit IRC | 05:30 | |
| *** amiconn_ is now known as amiconn | 05:30 | |
| *** DocScrutinizer05 has quit IRC | 06:03 | |
| *** DocScrutinizer05 has joined #maemo-ssu | 06:03 | |
| *** M4rtinK has quit IRC | 06:32 | |
| *** andre__ has joined #maemo-ssu | 08:11 | |
| *** andre__ has joined #maemo-ssu | 08:11 | |
| freemangordon | merlin1991: pong | 09:16 |
|---|---|---|
| *** LaoLang_cool has joined #maemo-ssu | 09:44 | |
| *** LaoLang_cool has quit IRC | 09:50 | |
| *** jonwil has joined #maemo-ssu | 10:00 | |
| *** jonwil has quit IRC | 10:08 | |
| *** Martix_ has joined #maemo-ssu | 10:19 | |
| *** kolp has joined #maemo-ssu | 10:38 | |
| *** Martix_ has quit IRC | 10:44 | |
| *** dhbiker_ has joined #maemo-ssu | 11:23 | |
| *** dhbiker has quit IRC | 11:23 | |
| *** dhbiker_ is now known as dhbiker | 11:24 | |
| *** FlameReaper has joined #maemo-ssu | 12:16 | |
| *** MrPingu has quit IRC | 12:18 | |
| DocScrutinizer51 | ~botsnack | 12:22 |
| infobot | DocScrutinizer51: :) | 12:23 |
| *** FlameReaper has quit IRC | 12:23 | |
| *** M4rtinK has joined #maemo-ssu | 12:32 | |
| *** FReaper has joined #maemo-ssu | 12:41 | |
| *** obironbo has joined #maemo-ssu | 12:47 | |
| *** MrPingu has joined #maemo-ssu | 12:49 | |
| *** Martix_ has joined #maemo-ssu | 12:50 | |
| *** MrPingu has quit IRC | 12:50 | |
| *** obironbo has left #maemo-ssu | 12:51 | |
| *** jonwil has joined #maemo-ssu | 13:09 | |
| *** arcean has joined #maemo-ssu | 13:28 | |
| *** jonwil has quit IRC | 13:28 | |
| freemangordon | arcean: is latest h-d in -devel? | 13:48 |
| *** lizardo has joined #maemo-ssu | 13:54 | |
| *** Martix_ has quit IRC | 13:55 | |
| *** arcean has quit IRC | 14:20 | |
| *** lizardo has quit IRC | 14:20 | |
| *** arcean has joined #maemo-ssu | 14:26 | |
| *** arcean has quit IRC | 15:07 | |
| merlin1991 | freemangordon: still around? | 15:11 |
| *** arcean has joined #maemo-ssu | 15:13 | |
| freemangordon | merlin1991: yes | 15:23 |
| merlin1991 | I'm about to rewrite the alarmd history with the merge request from pali, you'll have to reclone the repo, any objection? | 15:24 |
| freemangordon | reclone? why? | 15:24 |
| freemangordon | i mean... I am cloning repos everytime I issue an update to -thumb anyway | 15:24 |
| freemangordon | or you mean something special? | 15:25 |
| merlin1991 | well because the whole branch will have a different timeline | 15:25 |
| merlin1991 | you can't pull the changes | 15:25 |
| freemangordon | aah, i see | 15:25 |
| freemangordon | I am ok with that | 15:25 |
| merlin1991 | okay I'll go ahead then | 15:26 |
| freemangordon | merlin1991: a stupid question - is there a way to check for a C define in makefile? | 15:28 |
| merlin1991 | hm I only know the reverseway, define a c define in a makefile | 15:29 |
| merlin1991 | btw why do you do a fresh clone when you issue an update? | 15:29 |
| freemangordon | I am trying to keep the source code for all versions of -pr thing | 15:30 |
| freemangordon | i.e. the snapshot of what has been uploaded to the repo | 15:30 |
| merlin1991 | hm a list of commits would be enough :D | 15:30 |
| freemangordon | will stop when I run out of space | 15:31 |
| freemangordon | it is not, if I want to quickly rebuild an older version | 15:31 |
| merlin1991 | git checkout HASH && build ? | 15:32 |
| freemangordon | I am not exactly a git guru, you know :D | 15:32 |
| freemangordon | aah, I see | 15:32 |
| freemangordon | yeah, I know that, I just feel safer when I have the source code, for no particular reason | 15:33 |
| merlin1991 | well technically it should be the same .D | 15:34 |
| merlin1991 | that's what version control is made for ;) | 15:34 |
| kerio | why do you even have a repo for each package if you just rebuild it every time? | 15:34 |
| freemangordon | merlin1991: I know, but just feel better | 15:34 |
| freemangordon | however, I'll stop soon, as I run out of space in SB :D | 15:35 |
| merlin1991 | freemangordon: drop the files elsehere :D | 15:35 |
| merlin1991 | oh yes, unwatch finally works on gitorious again | 15:37 |
| merlin1991 | YAY | 15:37 |
| merlin1991 | bah only worked once | 15:39 |
| merlin1991 | it's foobar again | 15:39 |
| merlin1991 | FFS | 15:39 |
| *** FReaper has quit IRC | 15:44 | |
| *** jonwil has joined #maemo-ssu | 16:12 | |
| *** ivgalvez has joined #maemo-ssu | 16:22 | |
| *** Milhouse has quit IRC | 16:40 | |
| *** Milhouse has joined #maemo-ssu | 16:45 | |
| *** xes has joined #maemo-ssu | 16:46 | |
| *** Jade has joined #maemo-ssu | 16:47 | |
| *** Jade has joined #maemo-ssu | 16:47 | |
| *** Jaded has quit IRC | 16:50 | |
| freemangordon | merlin1991: have a minute? | 16:50 |
| freemangordon | merlin1991: I did git clone, git checkout -b $branch origin/$branch , made some changes to the code, commite them and tried git push | 16:51 |
| freemangordon | in the meanwhile there were changes to the repo, so push failed | 16:51 |
| freemangordon | i did git pull(to fetch the changes) and again push, for my commits to up | 16:52 |
| freemangordon | now, instead of my commit, see what is there https://github.com/tmeshkova/mozilla-central/commits/embedlite | 16:53 |
| freemangordon | "Merge branch 'embedlite' of git@github.com:tmeshkova/mozilla-central into embedlite" | 16:54 |
| freemangordon | WTF?!? | 16:54 |
| freemangordon | did i do something wrong or it is how git works? | 16:54 |
| freemangordon | my "real" commit is "X11InitThreads...", i.e. the next one | 16:55 |
| *** xes has quit IRC | 16:58 | |
| *** xes has joined #maemo-ssu | 17:01 | |
| *** Jaded has joined #maemo-ssu | 17:05 | |
| *** Jaded has joined #maemo-ssu | 17:05 | |
| *** Jade has quit IRC | 17:07 | |
| *** Jaded has quit IRC | 17:35 | |
| *** Jaded has joined #maemo-ssu | 17:36 | |
| *** Jaded has joined #maemo-ssu | 17:36 | |
| merlin1991 | freemangordon: well you did a pull | 17:43 |
| merlin1991 | a pull does a merge and a commit that merges | 17:43 |
| merlin1991 | you can do pull --rebase, then you don't get a merge commit, because git places your changes on top of the timeline | 17:43 |
| merlin1991 | also check your time, github tells me freemangordon authored in 15 minutes | 17:44 |
| merlin1991 | :D | 17:44 |
| *** lizardo has joined #maemo-ssu | 17:55 | |
| *** ivgalvez has quit IRC | 17:57 | |
| *** tadzik has quit IRC | 18:09 | |
| freemangordon | merlin1991: aaah, --rebase, that's what i've missed :D | 18:13 |
| kerio | merlin1991: now add community-devel.merlin1991.at ! | 18:13 |
| merlin1991 | nope.jpg | 18:14 |
| kerio | :( | 18:17 |
| kerio | why not? | 18:17 |
| kerio | it's not exactly a public repo, anyway | 18:17 |
| *** tadzik has joined #maemo-ssu | 18:33 | |
| *** NIN101 has joined #maemo-ssu | 18:37 | |
| *** Pali has joined #maemo-ssu | 19:11 | |
| *** toxaris has joined #maemo-ssu | 19:19 | |
| *** Jaded has quit IRC | 19:19 | |
| *** Jaded has joined #maemo-ssu | 19:20 | |
| *** Jaded has joined #maemo-ssu | 19:20 | |
| *** jonwil has quit IRC | 19:26 | |
| *** Pali has quit IRC | 19:35 | |
| *** tg has quit IRC | 19:37 | |
| *** inz has quit IRC | 19:38 | |
| *** arcean has quit IRC | 19:38 | |
| *** inz has joined #maemo-ssu | 19:39 | |
| *** tg has joined #maemo-ssu | 19:40 | |
| *** BCMM has joined #maemo-ssu | 19:57 | |
| *** tg has quit IRC | 19:59 | |
| *** inz has quit IRC | 19:59 | |
| *** Jaded has quit IRC | 19:59 | |
| *** tg has joined #maemo-ssu | 20:10 | |
| *** Jaded has joined #maemo-ssu | 20:10 | |
| *** Jaded has joined #maemo-ssu | 20:10 | |
| *** dhbiker has quit IRC | 20:23 | |
| *** xes has quit IRC | 20:31 | |
| *** xes has joined #maemo-ssu | 20:31 | |
| *** Martix_ has joined #maemo-ssu | 20:33 | |
| *** xes has quit IRC | 20:35 | |
| *** xes has joined #maemo-ssu | 20:39 | |
| *** xes has joined #maemo-ssu | 20:39 | |
| *** xes_ has joined #maemo-ssu | 20:39 | |
| *** xes_ has joined #maemo-ssu | 20:39 | |
| *** xes has quit IRC | 20:39 | |
| *** xes_ has quit IRC | 20:40 | |
| *** xes has joined #maemo-ssu | 20:40 | |
| *** xes has joined #maemo-ssu | 20:40 | |
| *** xes_ has joined #maemo-ssu | 20:40 | |
| *** xes_ has joined #maemo-ssu | 20:40 | |
| *** xes_ has quit IRC | 20:40 | |
| *** xes has quit IRC | 20:42 | |
| *** dhbiker has joined #maemo-ssu | 20:47 | |
| *** xes has joined #maemo-ssu | 20:49 | |
| *** nox- has joined #maemo-ssu | 20:57 | |
| *** Jaded has quit IRC | 21:21 | |
| *** macmaN has quit IRC | 21:32 | |
| *** Jade has joined #maemo-ssu | 21:34 | |
| *** Jade has joined #maemo-ssu | 21:34 | |
| *** macmaN has joined #maemo-ssu | 21:45 | |
| *** Jade is now known as jade | 22:08 | |
| *** phr3akDom has joined #maemo-ssu | 22:31 | |
| *** arcean has joined #maemo-ssu | 22:34 | |
| *** phr3akDom has left #maemo-ssu | 22:41 | |
| *** phr3akDom has joined #maemo-ssu | 22:41 | |
| *** nox- has quit IRC | 22:54 | |
| *** lizardo has quit IRC | 23:01 | |
| *** phr3akDom has quit IRC | 23:05 | |
| *** ShadowX has joined #maemo-ssu | 23:08 | |
| *** arcean has quit IRC | 23:08 | |
| *** BCMM has quit IRC | 23:10 | |
| *** xes has quit IRC | 23:21 | |
| *** xes has joined #maemo-ssu | 23:22 | |
| *** xes has joined #maemo-ssu | 23:22 | |
| *** arcean has joined #maemo-ssu | 23:30 | |
| *** nox- has joined #maemo-ssu | 23:35 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!