--- Log opened Sat Apr 04 00:00:23 2015
00:32 -!- KaZeR [~KaZeR@c-67-161-64-186.hsd1.ca.comcast.net] has joined #navit
00:32 -!- mode/#navit [+o KaZeR] by ChanServ
00:46 -!- circleci-bot [~circleci-@ec2-54-146-48-82.compute-1.amazonaws.com] has joined #navit
00:46 #navit: < circleci-bot> Success: pgrandin's build (#138; push) in navit-gps/navit (highfive) -- https://circleci.com/gh/navit-gps/navit/138
00:46 -!- circleci-bot [~circleci-@ec2-54-146-48-82.compute-1.amazonaws.com] has quit [Client Quit]
01:14 #navit: < Navit> See compile results history at http://download.navit-project.org/logs/navit/stats.html
04:23 -!- xenos1984 [~xenos1984@43-29-196-88.dyn.estpak.ee] has joined #navit
11:28 -!- woglinde [~henning@f052200128.adsl.alicedsl.de] has joined #navit
14:08 -!- woglinde [~henning@f052200128.adsl.alicedsl.de] has quit [Ping timeout: 264 seconds]
14:49 -!- tryagain [~quassel@178.216.76.50] has joined #navit
16:48 -!- jandegr [57415c14@gateway/web/freenode/ip.87.65.92.20] has joined #navit
17:36 #navit: <@KaZeR> hi there
17:38 #navit: < jandegr> hi kazer , yes you can :)
17:38 #navit: <@KaZeR> haha
17:38 #navit: <@KaZeR> currently resolving conflicts in the highfive branch to fast-forward it to head
17:39 #navit: < jandegr> https://circleci.com/gh/navit-gps/navit/138 yes , I knew you could :)
17:43 #navit: <@KaZeR> yes but now i need to fix the fast-forwarding issues :) cause h5 is built on a 4-5 months old code basis :)
17:45 #navit: < jandegr> I have always built it myself on a recent code base, so if I can then you can :)
17:47 #navit: <@KaZeR> the thing is that i want to make sure that we don't loose other changes
17:48 #navit: <@KaZeR> example :
17:48 #navit: <@KaZeR> https://gist.github.com/anonymous/ec9d4a7495ee2ff89127
17:49 #navit: <@KaZeR> and
17:49 #navit: <@KaZeR> https://gist.github.com/anonymous/0da024b7d95458e9c098
17:49 #navit: <@KaZeR> i think that the last two i have to merge
17:49 #navit: < jandegr> I see smth weird in your github :(
17:50 #navit: <@KaZeR> ha? what ?
17:50 #navit: <@KaZeR> in my github or in navit-gps ?
17:50 #navit: < jandegr> https://github.com/navit-gps/navit/commit/4cacee0e2b96f0a18a05cbe0dc9c731bf790951a
17:52 #navit: < jandegr> both mvglasow's and SF already have up to ATTR(exit_to)
17:52 #navit: < jandegr> but you still had to insert those ???
17:53 #navit: < jandegr> SF is only missing ATTR(street_destination_forward) +ATTR(street_destination_backward)
17:55 #navit: <@KaZeR> yep just added them in my local branch
17:56 #navit: < jandegr> then I understand you nagging all week  :)
18:06 #navit: <@KaZeR> :)
18:08 #navit: <@KaZeR> also the diff you just pasted if for h5 vs the trunk revision upon h5 was built on
18:09 #navit: < jandegr> uh, please clarify that ?
18:10 #navit: < jandegr> ok, I think I get it , but then you ignore that some parts were already merged up and down as well
18:11 #navit: < jandegr> It just looks to me as if you found the most difficult way :)
18:17 #navit: <@KaZeR> well, we can't just merge h5 against the current trunk as there has been conflicting changes. so i think that the easiest to to rewind to the revision h5 was based upon, merge, then fast forward to the head as git will merge *most* of the changes
18:17 #navit: <@KaZeR> do you see a better solution ?
18:20 #navit: < jandegr> I am already doing it now, is your trunk branch up to date ?
18:20 #navit: <@KaZeR> yes
18:21 #navit: < jandegr> ok, you create a jandegr-H5 branch/clone of it for me and I'll do the rest
18:44 -!- rah [rah@verain.settrans.net] has quit [Quit: leaving]
19:09 #navit: <@KaZeR> ok thanks.
19:10 #navit: <@KaZeR> do you have a local clone already ?
19:11 #navit: < jandegr> you know I have only a few envelopes in my drawer :)
19:12 #navit: <@KaZeR> oh right. let's do it together then :)
19:13 #navit: < jandegr> uh
19:13 #navit: <@KaZeR> git clone https://github.com/navit-gps/navit.git # will give you a fresh repo
19:13 #navit: <@KaZeR> cd navit && git checkout trunk # will give you the latest up to date copy of svn trunk
19:14 #navit: <@KaZeR> git branch jandegr-h5 # will create the branch for you
19:14 #navit: < jandegr> ok I'll write it down for tomorrow
19:14 #navit: <@KaZeR> based upon the branch you were using ( so trunk, which is what we want )
19:14 #navit: <@KaZeR> does this makes sense ?
19:15 #navit: < jandegr> I hope so for you, I can merge it in whatever version of code :)
19:16 #navit: <@KaZeR> that sounds good then. we just can't copy an old navigation.c out of the blue as there has been changes.. that's why i am being cautious
19:17 #navit: < jandegr> but I have the advantage that the thing still knows me :)
19:21 #navit: <@KaZeR> indeed :)
19:21 #navit: <@KaZeR> want to try branching now? it takes < 1 minute
19:22 #navit: <@KaZeR> then you just need to do the merging and push
19:22 #navit: < jandegr> already did all you wrote
19:23 #navit: <@KaZeR> cool
19:23 #navit: <@KaZeR> now you just need to merge your changes ( but please don't copy navigation.c over )
19:24 #navit: < jandegr> oh
19:26 #navit: <@KaZeR> see my problem? :)
19:27 #navit: < jandegr> no
19:27 #navit: <@KaZeR> ok nevermind. carry on then :)
19:30 #navit: < jandegr> how do I switch to jandegr-H5
19:31 #navit: < jandegr> I have jandegr-H5, master and trunk in green with an asterisk next to it
19:33 #navit: <@KaZeR> git checkout <branchname>
19:34 #navit: < jandegr> switched to branch 'jandegr-H5'
19:34 #navit: <@KaZeR> awesome. now you just need to merge the code
19:35 #navit: <@KaZeR> once you're done, git commit -m "useful message" <list of modified files>
19:35 #navit: <@KaZeR> and then you will need to push to github ( git push )
19:36 #navit: <@KaZeR> that's the big difference with svn : in git commits are local
19:42 #navit: < jandegr> git config email and name ?
19:44 #navit: <@KaZeR> git config --global user.name "Jan"; git config --global user.email "you know what"
19:44 #navit: <@KaZeR> i'm adding --global so that the config goes to ~/.gitconfig instead of the .git/config in the current repo ( and hence will be lost if you delete the repo)
19:49 #navit: < jandegr> no need to add a remote origin anymore before push ?
19:49 #navit: <@KaZeR> not for this case as you want to push a new branch
19:50 #navit: <@KaZeR> git push origin jandegr-H5 should work
19:51 #navit: <@KaZeR> this is not adding a remote origin : this is pushing a new branch to an origin
19:51 #navit: <@KaZeR> adding a remote origin would be setting up your branch to track trunk, for example
19:52 -!- circleci-bot [~circleci-@ec2-23-22-245-5.compute-1.amazonaws.com] has joined #navit
19:52 #navit: < circleci-bot> Success: jandegr's build (#139; push) in navit-gps/navit (jandegr-H5) -- https://circleci.com/gh/navit-gps/navit/139
19:52 -!- circleci-bot [~circleci-@ec2-23-22-245-5.compute-1.amazonaws.com] has quit [Client Quit]
19:52 #navit: < jandegr> first test https://github.com/navit-gps/navit/commit/f72ac29cfe7b5fbff601d644f2b8d3ef381429d6
19:52 #navit: < jandegr> really tired now :)
19:52 #navit: <@KaZeR> thanks for taking the time to test this :)
19:52 #navit: <@KaZeR> i'll setup coverity and tests for your branch
19:55 #navit: <@KaZeR> https://circle-artifacts.com/gh/navit-gps/routing-qa/42/artifacts/0/tmp/circle-artifacts.Rg2zYRf/route_66.yaml.gpx
19:56 #navit: <@KaZeR> ^- this is a big route using the legacy guidance. we will get this built automatically for h5 too and we can compare :)
20:02 -!- woglinde [~henning@f052200128.adsl.alicedsl.de] has joined #navit
20:12 -!- circleci-bot [~circleci-@ec2-54-224-12-147.compute-1.amazonaws.com] has joined #navit
20:12 #navit: < circleci-bot> Success: jandegr's build (#140; push) in navit-gps/navit (jandegr-H5) -- https://circleci.com/gh/navit-gps/navit/140
20:12 -!- circleci-bot [~circleci-@ec2-54-224-12-147.compute-1.amazonaws.com] has quit [Client Quit]
20:13 #navit: < jandegr> add some icons and a few changes to navit_shipped.xml and it's a wrap kazer
20:22 -!- circleci-bot [~circleci-@ec2-107-22-52-234.compute-1.amazonaws.com] has joined #navit
20:22 #navit: < circleci-bot> Success: jandegr's build (#141; push) in navit-gps/navit (jandegr-H5) -- https://circleci.com/gh/navit-gps/navit/141
20:22 -!- circleci-bot [~circleci-@ec2-107-22-52-234.compute-1.amazonaws.com] has quit [Client Quit]
20:37 -!- circleci-bot [~circleci-@ec2-54-163-57-116.compute-1.amazonaws.com] has joined #navit
20:37 #navit: < circleci-bot> Success: jandegr's build (#142; push) in navit-gps/navit (jandegr-H5) -- https://circleci.com/gh/navit-gps/navit/142
20:37 -!- circleci-bot [~circleci-@ec2-54-163-57-116.compute-1.amazonaws.com] has quit [Client Quit]
20:40 #navit: < jandegr> kazer , maybe smth small is still missing, but circle thinks it's ok :)
20:41 #navit: < Navit> mdankov * r6042 /trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java: Fix:port_android:Display country flag image in Android search dialog. http://sourceforge.net/p/navit/code/6042/
20:42 #navit: <@KaZeR> jandegr: yeah circle does not do a lot of tests on your branch right now :)
20:43 #navit: < jandegr> testing is all your's kazer , and merge 6042 into it :)
20:43 #navit: <@KaZeR> https://circleci.com/gh/navit-gps/routing-qa/45 will give us a better insight in a moment ( i need to speed this up )
20:43 #navit: <@KaZeR> let's see how easy it is to merge 6042
20:44 -!- circleci-bot [~circleci-@ec2-54-237-54-83.compute-1.amazonaws.com] has joined #navit
20:44 #navit: < circleci-bot> Success: pgrandin's build (#143; push) in navit-gps/navit (trunk) -- https://circleci.com/gh/navit-gps/navit/143
20:44 -!- circleci-bot [~circleci-@ec2-54-237-54-83.compute-1.amazonaws.com] has quit [Client Quit]
20:45 -!- circleci-bot [~circleci-@ec2-107-20-103-226.compute-1.amazonaws.com] has joined #navit
20:45 #navit: < circleci-bot> Success: pgrandin's build (#144; push) in navit-gps/navit (master) -- https://circleci.com/gh/navit-gps/navit/144
20:45 -!- circleci-bot [~circleci-@ec2-107-20-103-226.compute-1.amazonaws.com] has quit [Client Quit]
20:46 #navit: <@KaZeR> https://github.com/navit-gps/navit/commits/jandegr-H5 -> here we go :)
20:46 #navit: <@KaZeR> thanks jandegr for making my life easier :)
20:46 -!- circleci-bot [~circleci-@ec2-54-237-54-83.compute-1.amazonaws.com] has joined #navit
20:46 #navit: < circleci-bot> Success: pgrandin's build (#145; push) in navit-gps/navit (jandegr-H5) -- https://circleci.com/gh/navit-gps/navit/145
20:46 -!- circleci-bot [~circleci-@ec2-54-237-54-83.compute-1.amazonaws.com] has quit [Client Quit]
20:46 #navit: < jandegr> whas that what all the fuzz was about ?
20:47 #navit: < jandegr> can't you make circle compile it ?
20:47 #navit: <@KaZeR> yep i'll do that right now
20:47 #navit: <@KaZeR> the fuzz what about things like https://gist.github.com/anonymous/ec9d4a7495ee2ff89127 that need a deeper review on my side since i don't know what the changes were about
20:48 #navit: <@KaZeR> and it's also about having a better workflow
20:48 #navit: < jandegr> workflow is easy, you do all the work and it flows :)
20:58 #navit: < tryagain> KaZeR it looks like this commit: http://sourceforge.net/p/navit/code/6000/
20:58 #navit: < tryagain> sp just make sure we do not log a debug message at warning level
20:59 #navit: < jandegr> can't you make circle compile it ?
21:06 #navit: < tryagain> I hope http://sourceforge.net/p/navit/code/5935/ by mvglasow is already integrated in H5. Then we need to verify if 5960, 5967? 5998, 6000 are applied and redo them manually, if needed.
21:06 #navit: < tryagain> sorry, i have no access to circle
21:08 #navit: < jandegr> sorry tryagain, that was meant for kazer :)
21:08 #navit: < jandegr> you're really drifting folks :)
21:10 -!- jandegr [57415c14@gateway/web/freenode/ip.87.65.92.20] has quit [Quit: Page closed]
21:19 #navit: <@KaZeR> tryagain: that's exactly why i've been complaining about this merge. h5 is based upon an older release
21:19 #navit: <@KaZeR> s/release/revision/
21:20 #navit: <@KaZeR> tryagain: my first approach was to apply h5 as a patch against 59xx smth, then fast forward to make sure that we don't loose commits
21:21 #navit: < tryagain> Do you know what's exact release it's based upon?
21:21 #navit: <@KaZeR> yep : 5975
21:22 #navit: < tryagain> so we have only two commits to check
21:22 #navit: < tryagain> both look trivial
21:22 #navit: < tryagain> or do they have changed something besides navigation.c?
21:23 #navit: <@KaZeR> that's what i was digging into. the merge yields only two conflicts in navigation.c : https://gist.github.com/anonymous/ec9d4a7495ee2ff89127 and https://gist.github.com/anonymous/0da024b7d95458e9c098
21:27 #navit: < tryagain> first one is about r6000, which fixes one dbg(1, ... ) to dbg(lvl_debug,...)
21:28 #navit: < tryagain> second one is http://sourceforge.net/p/navit/code/5998/ which seems to remove unused variable
21:29 #navit: < tryagain> just look at the code and change two lines manually if lines to change are still in the code
21:31 #navit: <@KaZeR> well from the diff the first one is an addition from what i understand, so it should be safe to just add it
21:33 #navit: < tryagain> first one was a change in current (non-h5) code http://sourceforge.net/p/navit/code/6000/ The whole dbg statement might have been removed by h5 team
21:34 #navit: <@KaZeR> indeed, read it backwards
21:34 #navit: <@KaZeR> i'll remove it then, and it looks like we are done
21:35 #navit: < tryagain> looks like that
21:37 #navit: <@KaZeR> now it would be interesting to see if Jan's merge gave the same resulting code :)
21:37 #navit: <@KaZeR> nop it did not.
21:40 -!- circleci-bot [~circleci-@ec2-54-237-46-108.compute-1.amazonaws.com] has joined #navit
21:40 #navit: < circleci-bot> Success: pgrandin's build (#146; push) in navit-gps/navit (highfive) -- https://circleci.com/gh/navit-gps/navit/146
21:40 -!- circleci-bot [~circleci-@ec2-54-237-46-108.compute-1.amazonaws.com] has quit [Client Quit]
21:46 #navit: <@KaZeR> i will have to go afk. thanks tryagain for your help!
21:46 -!- woglinde [~henning@f052200128.adsl.alicedsl.de] has quit [Ping timeout: 265 seconds]
21:46 #navit: < tryagain> ok, and you're welcome
21:46 #navit: <@KaZeR> route 66 test with h5 : https://circle-artifacts.com/gh/navit-gps/routing-qa/45/artifacts/0/tmp/circle-artifacts.VhQMh8k/route_66.yaml.gpx
21:47 #navit: <@KaZeR> to compare with legacy : https://circle-artifacts.com/gh/navit-gps/routing-qa/42/artifacts/0/tmp/circle-artifacts.Rg2zYRf/route_66.yaml.gpx
22:03 #navit: < tryagain> hey is it route 66 from Disney's Cars?
22:04 #navit: < tryagain> and where's Radiator Springs?
22:07 #navit: < tryagain>  http://umap.openstreetmap.fr/ru/map/anonymous-edit/35263%3AbMds_b-
22:15 #navit: < tryagain> bad map, doesnt show actual announcements
22:48 -!- xenos1984 [~xenos1984@43-29-196-88.dyn.estpak.ee] has quit [Quit: Leaving.]
23:51 #navit: <@KaZeR> haha :)
23:52 #navit: <@KaZeR> mmm what's the link you sent tryagain ?
23:52 #navit: <@KaZeR> i will add a geojson export, they are easy to graph and easy to version
23:53 #navit: <@KaZeR> the link you pasted gives me 'bad signature'
--- Log closed Sun Apr 05 00:00:23 2015