| 00:20.53 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 01:32.26 | *** join/#maemo-ssu amiconn (amiconn@rockbox/developer/amiconn) |
| 01:46.21 | *** join/#maemo-ssu wmarone (~wmarone@c-67-174-151-253.hsd1.ca.comcast.net) |
| 03:19.45 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 03:30.32 | *** join/#maemo-ssu amiconn_ (amiconn@rockbox/developer/amiconn) |
| 04:03.53 | *** join/#maemo-ssu DocScrutinizer05 (~HaleBopp@openmoko/engineers/joerg) |
| 06:11.22 | *** join/#maemo-ssu andre__ (~andre@ip-84-42-203-5.net.upcbroadband.cz) |
| 06:11.22 | *** join/#maemo-ssu andre__ (~andre@wikimedia/aklapper) |
| 07:16.33 | freemangordon | merlin1991: pong |
| 07:44.24 | *** join/#maemo-ssu LaoLang_cool (~LaoLang_c@120.85.133.181) |
| 08:00.01 | *** join/#maemo-ssu jonwil (~jonwil@27-33-137-199.static.tpgi.com.au) |
| 08:19.04 | *** join/#maemo-ssu Martix_ (~martix@ip-62-245-106-78.net.upcbroadband.cz) |
| 08:38.26 | *** join/#maemo-ssu kolp (~quassel@212.255.225.82) |
| 09:23.16 | *** join/#maemo-ssu dhbiker_ (~dhbiker@95.87.145.172) |
| 10:16.51 | *** join/#maemo-ssu FlameReaper (~assassin@203.106.65.208) |
| 10:23.00 | DocScrutinizer51 | ~botsnack |
| 10:23.00 | infobot | DocScrutinizer51: :) |
| 10:32.01 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |
| 10:41.40 | *** join/#maemo-ssu FReaper (~assassin@203.106.65.208) |
| 10:47.13 | *** join/#maemo-ssu obironbo (~chatzilla@tn-76-7-165-130.sta.embarqhsd.net) |
| 10:49.40 | *** join/#maemo-ssu MrPingu (~MrPingute@ip212-238-46-82.hotspotsvankpn.com) |
| 10:50.02 | *** join/#maemo-ssu Martix_ (~martix@ip-62-245-106-78.net.upcbroadband.cz) |
| 10:51.07 | *** part/#maemo-ssu obironbo (~chatzilla@tn-76-7-165-130.sta.embarqhsd.net) |
| 11:09.21 | *** join/#maemo-ssu jonwil (~jonwil@27-33-137-199.static.tpgi.com.au) |
| 11:28.09 | *** join/#maemo-ssu arcean (~arcean@aafq209.neoplus.adsl.tpnet.pl) |
| 11:48.16 | freemangordon | arcean: is latest h-d in -devel? |
| 11:54.52 | *** join/#maemo-ssu lizardo (lizardo@nat/indt/x-trjiluxeldpbhtjd) |
| 12:26.02 | *** join/#maemo-ssu arcean (~arcean@aafq209.neoplus.adsl.tpnet.pl) |
| 13:11.06 | merlin1991 | freemangordon: still around? |
| 13:13.06 | *** join/#maemo-ssu arcean (~arcean@aafq209.neoplus.adsl.tpnet.pl) |
| 13:23.05 | freemangordon | merlin1991: yes |
| 13:24.07 | merlin1991 | I'm about to rewrite the alarmd history with the merge request from pali, you'll have to reclone the repo, any objection? |
| 13:24.27 | freemangordon | reclone? why? |
| 13:24.59 | freemangordon | i mean... I am cloning repos everytime I issue an update to -thumb anyway |
| 13:25.07 | freemangordon | or you mean something special? |
| 13:25.10 | merlin1991 | well because the whole branch will have a different timeline |
| 13:25.18 | merlin1991 | you can't pull the changes |
| 13:25.24 | freemangordon | aah, i see |
| 13:25.29 | freemangordon | I am ok with that |
| 13:26.11 | merlin1991 | okay I'll go ahead then |
| 13:28.29 | freemangordon | merlin1991: a stupid question - is there a way to check for a C define in makefile? |
| 13:29.17 | merlin1991 | hm I only know the reverseway, define a c define in a makefile |
| 13:29.46 | merlin1991 | btw why do you do a fresh clone when you issue an update? |
| 13:30.13 | freemangordon | I am trying to keep the source code for all versions of -pr thing |
| 13:30.40 | freemangordon | i.e. the snapshot of what has been uploaded to the repo |
| 13:30.55 | merlin1991 | hm a list of commits would be enough :D |
| 13:31.02 | freemangordon | will stop when I run out of space |
| 13:31.28 | freemangordon | it is not, if I want to quickly rebuild an older version |
| 13:32.11 | merlin1991 | git checkout HASH && build ? |
| 13:32.36 | freemangordon | I am not exactly a git guru, you know :D |
| 13:32.49 | freemangordon | aah, I see |
| 13:33.30 | freemangordon | yeah, I know that, I just feel safer when I have the source code, for no particular reason |
| 13:34.23 | merlin1991 | well technically it should be the same .D |
| 13:34.32 | merlin1991 | that's what version control is made for ;) |
| 13:34.46 | kerio | why do you even have a repo for each package if you just rebuild it every time? |
| 13:34.47 | freemangordon | merlin1991: I know, but just feel better |
| 13:35.06 | freemangordon | however, I'll stop soon, as I run out of space in SB :D |
| 13:35.25 | merlin1991 | freemangordon: drop the files elsehere :D |
| 13:37.50 | merlin1991 | oh yes, unwatch finally works on gitorious again |
| 13:37.50 | merlin1991 | YAY |
| 13:39.51 | merlin1991 | bah only worked once |
| 13:39.54 | merlin1991 | it's foobar again |
| 13:39.55 | merlin1991 | FFS |
| 14:12.21 | *** join/#maemo-ssu jonwil (~jonwil@27-33-137-199.static.tpgi.com.au) |
| 14:22.52 | *** join/#maemo-ssu ivgalvez (~ivgalvez@89.140.113.138.static.user.ono.com) |
| 14:45.07 | *** join/#maemo-ssu Milhouse (~Milhouse@Maemo/community/contributor/Milhouse) |
| 14:46.45 | *** join/#maemo-ssu xes (~xes@host109-236-dynamic.16-79-r.retail.telecomitalia.it) |
| 14:47.38 | *** join/#maemo-ssu Jade (~jade@Jade.broker.freenet6.net) |
| 14:47.38 | *** join/#maemo-ssu Jade (~jade@unaffiliated/jade) |
| 14:50.04 | freemangordon | merlin1991: have a minute? |
| 14:51.20 | freemangordon | merlin1991: I did git clone, git checkout -b $branch origin/$branch , made some changes to the code, commite them and tried git push |
| 14:51.41 | freemangordon | in the meanwhile there were changes to the repo, so push failed |
| 14:52.11 | freemangordon | i did git pull(to fetch the changes) and again push, for my commits to up |
| 14:53.26 | freemangordon | now, instead of my commit, see what is there https://github.com/tmeshkova/mozilla-central/commits/embedlite |
| 14:54.07 | freemangordon | "Merge branch 'embedlite' of git@github.com:tmeshkova/mozilla-central into embedlite" |
| 14:54.11 | freemangordon | WTF?!? |
| 14:54.23 | freemangordon | did i do something wrong or it is how git works? |
| 14:55.02 | freemangordon | my "real" commit is "X11InitThreads...", i.e. the next one |
| 15:01.51 | *** join/#maemo-ssu xes (~xes@host109-236-dynamic.16-79-r.retail.telecomitalia.it) |
| 15:05.00 | *** join/#maemo-ssu Jaded (~jade@Jade.broker.freenet6.net) |
| 15:05.00 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 15:36.04 | *** join/#maemo-ssu Jaded (~jade@Jade.broker.freenet6.net) |
| 15:36.04 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 15:43.12 | merlin1991 | freemangordon: well you did a pull |
| 15:43.21 | merlin1991 | a pull does a merge and a commit that merges |
| 15:43.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 |
| 15:44.17 | merlin1991 | also check your time, github tells me freemangordon authored in 15 minutes |
| 15:44.18 | merlin1991 | :D |
| 15:55.14 | *** join/#maemo-ssu lizardo (lizardo@nat/indt/x-nbefpxdtimolhkyt) |
| 16:13.06 | freemangordon | merlin1991: aaah, --rebase, that's what i've missed :D |
| 16:13.08 | kerio | merlin1991: now add community-devel.merlin1991.at ! |
| 16:14.11 | merlin1991 | nope.jpg |
| 16:17.43 | kerio | :( |
| 16:17.45 | kerio | why not? |
| 16:17.54 | kerio | it's not exactly a public repo, anyway |
| 16:33.47 | *** join/#maemo-ssu tadzik (tjs@feather.perl6.nl) |
| 16:37.49 | *** join/#maemo-ssu NIN101 (~NIN@p5DD28B01.dip0.t-ipconnect.de) |
| 17:11.19 | *** join/#maemo-ssu Pali (~pali@Maemo/community/contributor/Pali) |
| 17:19.14 | *** join/#maemo-ssu toxaris (~toxaris@s83-180-246-172.cust.tele2.se) |
| 17:20.09 | *** join/#maemo-ssu Jaded (~jade@Jade.broker.freenet6.net) |
| 17:20.09 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 17:39.24 | *** join/#maemo-ssu inz (inz@inz.fi) |
| 17:40.36 | *** join/#maemo-ssu tg (~irc@2001:738:2001:2078:0:215:11:82) |
| 17:57.07 | *** join/#maemo-ssu BCMM (~BCMM@unaffiliated/bcmm) |
| 18:10.00 | *** join/#maemo-ssu tg (~irc@sch-1526621511.sch.bme.hu) |
| 18:10.22 | *** join/#maemo-ssu Jaded (~jade@Jade.broker.freenet6.net) |
| 18:10.22 | *** join/#maemo-ssu Jaded (~jade@unaffiliated/jade) |
| 18:31.10 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 18:33.48 | *** join/#maemo-ssu Martix_ (~martix@ip-62-245-106-78.net.upcbroadband.cz) |
| 18:39.26 | *** join/#maemo-ssu xes (~xes@host44-237-dynamic.14-87-r.retail.telecomitalia.it) |
| 18:39.26 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 18:39.35 | *** join/#maemo-ssu xes_ (~xes@host44-237-dynamic.14-87-r.retail.telecomitalia.it) |
| 18:39.35 | *** join/#maemo-ssu xes_ (~xes@unaffiliated/xes) |
| 18:40.28 | *** join/#maemo-ssu xes (~xes@host44-237-dynamic.14-87-r.retail.telecomitalia.it) |
| 18:40.28 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 18:40.32 | *** join/#maemo-ssu xes_ (~xes@unaffiliated/xes) |
| 18:47.56 | *** join/#maemo-ssu dhbiker (~dhbiker@95.87.145.172) |
| 18:49.34 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 18:57.16 | *** join/#maemo-ssu nox- (noident@freebsd/developer/nox) |
| 19:34.49 | *** join/#maemo-ssu Jade (~jade@Jade.broker.freenet6.net) |
| 19:34.49 | *** join/#maemo-ssu Jade (~jade@unaffiliated/jade) |
| 19:45.56 | *** join/#maemo-ssu macmaN (~chezburge@138.167.190.90.dyn.estpak.ee) |
| 20:31.24 | *** join/#maemo-ssu phr3akDom (~phr3ak@ip-213-220-198-105.net.upcbroadband.cz) |
| 20:34.57 | *** join/#maemo-ssu arcean (~arcean@aacv200.neoplus.adsl.tpnet.pl) |
| 20:41.04 | *** part/#maemo-ssu phr3akDom (~phr3ak@ip-213-220-198-105.net.upcbroadband.cz) |
| 20:41.11 | *** join/#maemo-ssu phr3akDom (~phr3ak@ip-213-220-198-105.net.upcbroadband.cz) |
| 21:08.30 | *** join/#maemo-ssu ShadowX (~l4m3rx@darknet.escom.bg) |
| 21:22.12 | *** join/#maemo-ssu xes (~xes@host44-237-dynamic.14-87-r.retail.telecomitalia.it) |
| 21:22.12 | *** join/#maemo-ssu xes (~xes@unaffiliated/xes) |
| 21:30.50 | *** join/#maemo-ssu arcean (~arcean@aacv200.neoplus.adsl.tpnet.pl) |
| 21:35.08 | *** join/#maemo-ssu nox- (noident@freebsd/developer/nox) |
| 22:18.59 | *** join/#maemo-ssu joshgillies (~josh@hobart.office.squiz.net) |
| 22:19.56 | *** part/#maemo-ssu joshgillies (~josh@hobart.office.squiz.net) |
| 22:27.42 | *** join/#maemo-ssu MrPingu (~MrPingute@86.92.226.97) |
| 22:32.13 | *** join/#maemo-ssu iDont (~iDont@ip4da305b4.direct-adsl.nl) |
| 22:40.46 | *** join/#maemo-ssu iDont (~iDont@ip4da305b4.direct-adsl.nl) |
| 22:43.12 | *** join/#maemo-ssu _rd (~rd@p57B48649.dip0.t-ipconnect.de) |
| 22:51.04 | *** join/#maemo-ssu MrPingu (~MrPingute@86.92.226.97) |
| 23:31.26 | *** join/#maemo-ssu andre__ (~andre@wikimedia/aklapper) |
| 23:36.31 | *** join/#maemo-ssu joshgillies (~josh@hobart.office.squiz.net) |