--- Log opened Wed Jan 10 00:00:45 2018 00:09 -!- Horwitz [~mich1@p200300800E5F3E00022268FFFE64E7C4.dip0.t-ipconnect.de] has quit [Ping timeout: 265 seconds] 00:22 -!- Horwitz [~mich1@p200300800E143200022268FFFE64E7C4.dip0.t-ipconnect.de] has joined #navit 00:22 -!- mode/#navit [+o Horwitz] by ChanServ 00:36 -!- Horwitz [~mich1@p200300800E143200022268FFFE64E7C4.dip0.t-ipconnect.de] has quit [Ping timeout: 276 seconds] 00:36 -!- noradtux [~noradtux@2a02:2028:750:3301:ec4:7aff:fe33:3dc1] has quit [Ping timeout: 276 seconds] 00:36 -!- Horwitz [~mich1@p200300800E143200022268FFFE64E7C4.dip0.t-ipconnect.de] has joined #navit 00:36 -!- mode/#navit [+o Horwitz] by ChanServ 00:38 -!- noradtux [~noradtux@2a02:2028:750:3301:ec4:7aff:fe33:3dc1] has joined #navit 00:39 #navit: < Navit> The following compiles failed: http://download.navit-project.org/logs/navit/android_armv5te/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/osm-exp/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/src/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/openmoko/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/win32/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/n 00:39 #navit: < Navit> oad.navit-project.org/logs/navit/android_armv4t/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/android_x86/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/tomtom/svn/navit-svn-.failed 00:39 #navit: < Navit> See compile results history at http://download.navit-project.org/logs/navit/stats.html 01:42 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has quit [Ping timeout: 240 seconds] 01:48 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has joined #navit 05:03 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has quit [Ping timeout: 260 seconds] 05:05 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has joined #navit 05:10 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has quit [Ping timeout: 248 seconds] 05:15 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has joined #navit 05:40 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has quit [Ping timeout: 276 seconds] 05:44 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has joined #navit 05:48 -!- noradtux [~noradtux@2a02:2028:750:3301:ec4:7aff:fe33:3dc1] has quit [Ping timeout: 255 seconds] 05:53 -!- noradtux [~noradtux@2a02:2028:72a:7e01:ec4:7aff:fe33:3dc1] has joined #navit 06:01 -!- xenos1984 [~xenos1984@2001:bb8:2002:200:6651:6ff:fe53:a120] has joined #navit 06:01 -!- mode/#navit [+v xenos1984] by ChanServ 15:36 -!- xenos1984 [~xenos1984@2001:bb8:2002:200:6651:6ff:fe53:a120] has quit [Quit: Leaving.] 15:48 -!- ILoveKiruna_ [~pho17@139.174.154.8] has joined #navit 16:05 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has joined #navit 16:05 -!- mode/#navit [+v xenos1984] by ChanServ 16:08 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has quit [Client Quit] 16:08 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has joined #navit 16:08 -!- mode/#navit [+v xenos1984] by ChanServ 16:53 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has quit [Ping timeout: 276 seconds] 17:05 -!- ColdFyre [~lenny@24-113-172-199.wavecable.com] has joined #navit 17:12 #navit: <@KaZeR> hi there 17:26 -!- ILoveKiruna_ [~pho17@139.174.154.8] has quit [Quit: Konversation terminated!] 18:04 -!- jandegr [4d6d7098@gateway/web/freenode/ip.77.109.112.152] has joined #navit 18:07 #navit: <@KaZeR> hey jandegr ! 18:08 #navit: < jandegr> hi kazer 18:46 #navit: <+ilovekiruna> hi kazer 18:47 #navit: <+ilovekiruna> hi jandegr 18:51 #navit: <@KaZeR> hey ilovekiruna 18:52 #navit: <+ilovekiruna> KaZeR: do you still have my patch file? 18:52 #navit: <+ilovekiruna> I think at least one of my additions needs revision 18:56 #navit: <@KaZeR> ilovekiruna: that's why we should use a branch ;) 18:56 #navit: <@KaZeR> i can probably find it via the logs though 18:57 #navit: <+ilovekiruna> i should still have it 18:57 #navit: <+ilovekiruna> no worries 19:00 -!- charles__ [48241adf@gateway/web/freenode/ip.72.36.26.223] has quit [Quit: Page closed] 19:01 #navit: <+ilovekiruna> KaZeR: where should i upload it? 19:03 #navit: <@KaZeR> ilovekiruna: the patch? or the branch? 19:15 #navit: <+ilovekiruna> the patch 19:15 #navit: <+ilovekiruna> i didnt make a branch at that point because of the unclear format for me of commit messages 19:15 #navit: <+ilovekiruna> u and jkoan were pretty busy that time 19:20 #navit: <@KaZeR> don't worry too much about the commit messages format in branches. we do squash merges anyway, so we can easily make all commits in a branch appear as one single clean commit in trunk 19:21 #navit: <@KaZeR> but otherwise, something like "fix:build:fixed compiler warning" would work i think 19:26 #navit: <+ilovekiruna> ok 19:26 #navit: <+ilovekiruna> how would u now suggest to proceed? 19:27 -!- jandegr [4d6d7098@gateway/web/freenode/ip.77.109.112.152] has quit [Ping timeout: 260 seconds] 19:30 #navit: <@KaZeR> git checkout -b fix_compiler_warnings; fix a couple of warnings, then open a PR for review :) 19:30 #navit: <@KaZeR> should be super fast to merge that way 19:30 #navit: <+ilovekiruna> made already my branch 19:31 #navit: <@KaZeR> it might be useful to group the fixes per components. Reviewing for the UI is different from reviewing for routing for example 19:31 #navit: <@KaZeR> cool then you should only need to push the branch from time to time 19:31 #navit: <+ilovekiruna> ok, i just check which folders are affected and u give me some hints 19:32 #navit: <+ilovekiruna> vehicle maptool root gui graphics 19:32 #navit: <+ilovekiruna> should i split in that fashion? 19:35 #navit: <@KaZeR> that's perfect 19:49 #navit: <+ilovekiruna> pushed to my own repo 19:49 #navit: <+ilovekiruna> now a PR? 19:51 #navit: <+ilovekiruna> how to create the branch then in the main repo? 20:12 #navit: <@KaZeR> https://github.com/navit-gps/navit/compare/trunk...hoehnp:fix_compiler_warning?expand=1 should do it 20:13 #navit: <@KaZeR> (head over to github UI, select the branch, click "New Pull Request" 20:13 #navit: <@KaZeR> the branch does not need to be in the main repo to be able to create a PR 20:13 #navit: <@KaZeR> but if you create that branch in the main repo instead of your own, others can contribute 20:15 #navit: <+ilovekiruna> hv done so already and put u as reviewer 20:15 #navit: <+ilovekiruna> not sure if u noticed yet 20:17 #navit: <@KaZeR> i have ~800 emails in my github folder so i'm usually missing notifications :) 20:17 #navit: <@KaZeR> it's totally fine to ping me here anyway 20:21 #navit: <+ilovekiruna> ok, so now u r informed :-p 20:25 #navit: <@KaZeR> https://github.com/navit-gps/navit/pull/391/commits/f318cb7cda17e7c0d1524bca35e18f610a7f9e7e is outside of the scope i think 20:25 #navit: <@KaZeR> can you cherry pick in your branch to remove it ? it'll make it disappear from the PR 21:15 #navit: <+ilovekiruna> can u give me a hint again how to do the cherry picking? 21:41 #navit: <+ilovekiruna> stop the PR and then redo it? 21:55 #navit: <@KaZeR> no need to stop the PR 21:58 #navit: <@KaZeR> and i meant rebasing :) 21:59 #navit: <@KaZeR> try git rebase -i, and drop the circleci commit. You can then push and it will be as if this commit never existed in the PR 22:03 #navit: <+ilovekiruna> didnt get it yet 22:03 #navit: <+ilovekiruna> could u please guide me through command by command? 22:04 #navit: <@KaZeR> sure. are you in the branch? 22:07 #navit: <@KaZeR> here we want to look at the last 2 commits made on that branch 22:07 #navit: <@KaZeR> so try "git rebase -i HEAD~2" (head, and the last 2 commits) 22:07 #navit: <@KaZeR> you'll get a prompt in your file editor. replace 'pick' by 'drop' at the beginning of the line containing your circleci change 22:07 #navit: <@KaZeR> save exit.. tada! 22:08 #navit: <@KaZeR> you can then double check using git log, that commit will be gone 22:18 #navit: <+ilovekiruna> on which repository? 22:28 #navit: <@KaZeR> yours 22:29 #navit: <@KaZeR> (the source of the pr) 22:29 #navit: <+ilovekiruna> I think i messed up a little 22:29 #navit: <+ilovekiruna> i just removed the line with circle 22:29 #navit: <+ilovekiruna> now cant push to github 22:29 #navit: <+ilovekiruna> still quite a bit to learn for me :( 22:45 #navit: <+ilovekiruna> seems I managed now :) 22:45 #navit: <+ilovekiruna> please verify 22:51 #navit: <+ilovekiruna> seems like build failed for tomotom 23:02 #navit: <@KaZeR> yep, one commit, perfect 23:03 #navit: <@KaZeR> oh wait.. for some reason your PR is using CI code that's from CI v1 23:04 #navit: <@KaZeR> oh wow, it's based on a trunk from May 13th :) 23:04 #navit: <@KaZeR> try git pull; git merge trunk 23:04 #navit: <@KaZeR> it should bring it up to date 23:10 #navit: <+ilovekiruna> will that take trunk from my github repo or navits? 23:30 #navit: <+ilovekiruna> i think i fix that tomorrow eve 23:30 #navit: <+ilovekiruna> good night 23:35 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has quit [Ping timeout: 276 seconds] 23:42 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has joined #navit --- Log closed Thu Jan 11 00:00:47 2018