Re: [Potlatch-dev] Github, and tram/road issues
On 19 February 2012 02:36, Steve Bennett wrote: > Ok, it looks like I'm still doing something wrong: > > https://github.com/systemed/potlatch2/pull/25 > > I only wanted to include one commit in the pull request, not 9. Is the > idea that I keep rewinding my local repository back to the current > master before making any change? Or is there some trick with rebase, > to avoid this situation? Well, making feature branches starting from richardf's latest master is a reasonable approach. The problem with that pull request is that the commit you want ( ac1d25 ) doesn't have anything from richard's repo as the parent - it has f2e94bc7 as a parent, which has its own parent etc. Richard can't add ac1d25 without those parents - in git, a commit's parents are part of the commit and are even encoded into the commit id. So yeah, best thing to do is to have feature branches based on a reasonably recent commit from Richard's repo, and pull request these branches. To make your life easier I can recommend keeping your "master" branch as an exact mirror of Richard's, start the day with a quick "git fetch systemed; git checkout master; git merge --ff-only systemed/master; git checkout -b something-new". Well, that's more or less how I work, and it works for me (tm)! Cheers, Andy ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] "Designation" tag on most map features
On 19 February 2012 07:16, Steve Bennett wrote: > Obviously 2) is easy to fix. But what about 1? Is it time we > implemented locale-specific map_features? I refer to them as region-specific map_features, not locale-specific map features - locale and language are too easily confused! This has been a long-term goal of mine, stretching back many years. I want to tailor things like road signs (and hints on what format the references should be) on a per-country basis - so that when you're mapping in Switzerland there are green Autoroute signs and when you're in France it knows that highway=secondary is a Departmental road with refs starting with a D. However, to say that adds complexity would be an understatement. I'm not going to start on that until we have a much better idea how to manage it - we aren't even at the stage of widespread UI translations yet, and we don't have a translatable global map_features yet, so I'm not going to start making life even more complex by adding in regions! The end goal, for me, is definitely a cross matrix of language and regions, so that no matter what language you speak, and what country you happen to be in today, the interface looks as much like what you have in the photo as possible. Cheers, Andy P.S. http://wiki.openstreetmap.org/wiki/Highway:International_equivalence shows the tip of the iceberg ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
