Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Wed, Nov 11, 2009 at 8:17 PM, Frederik Ramm frede...@remote.org wrote: Ævar Arnfjörð Bjarmason wrote: That's a non sequitur actually, the git-svn frontend is conduit between SVN and has its limited uses but converting between centralized and distributed version control is always going to be a case of casting a square peg into a round hole. I don't have much git clue but some may remember that JOSM was in git, briefly, when Gabriel Ebner did his work on dropping segments. Conceptually, what would be the difference between putting JOSM on git and putting it on the project-wide SVN altogehter? If the main advantage of git is that it would become easier for anyone to contribute even if no maintainer has the time to review a patch, then the same could be achieved by going the same way that almost all other OSM applications go and put it on svn.openstreetmap.org - couldn't it? Sure, it could be moved to the main OSM SVN. But it has been my understanding that the main JOSM developers like keeping the gates to their main repository fairly closed, and in that case if they used a distributed version control system they could have their cake and eat it too. Very few people could be given access to the main repository (the ones official .jar files get compiled from) but everyone would have access to version control. If you're unfamiliar with distributed version control I think the best way to explain it is that things which now happen outside version control in the project will be brought into the loop. For instance now people who don't have commit access may be submitting huge patches to trac without commit messages, and often many successive patches as it gets reviewed. If the project were using dvcs (correctly) those patchsets would be developed in someone's local repository along with commit history until they could be merged into the mainline. At one point I had two pending patches to JOSM and wanted to develop a third one. I had already submitted them to trac but for each change I had done: svn diff [files relevant to the patch] change-a.patch rm [files relevant to the patch] svn up If the project had been using git I could have commited each of those changes to their own local branch while they were pending inclusion. Also, if we were to use git, would we depend on a third-party service like github, or is git also usable (in a sensible way) without such a site? Presumably if JOSM were to switch to something else it would want to use something like the Trac plugin for Git to provide integration to josm.openstreetmap.de. But using github certainly has a lot of advantages. Also with git you're never really dependent on third-party hosting. Even if a project is using github and github is taken over by flesh-eating aliens tomorrow getting everyone back on track is just a matter of turning any checked out copy (because they all have full history) into a hosted git:// repository and sending a message to the mailing list telling everyone to commit to that. ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
GIT --- http://github.com/migurski/paperwalking Shaun On 10 Nov 2009, at 15:02, Ævar Arnfjörð Bjarmason wrote: Hi. I was going to hack JOSM so that it displays the description of walking papers in info dialogs / tooltips / the layer selector. Could you please add this to the span id=scan-info style=display: none; section so it's easy to parse, e.g. here: http://walking-papers.org/scan.php?id=bth2fvmt It's only available as: p style=font-style: italic; Various West Oakland churches around the BART station. /p But I'd like to have: span class=descriptionVarious West Oakland churches around the BART station./span Also if there's some other misc. info in your database that's not in that section it would probably be useful to add it there. ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Tue, Nov 10, 2009 at 3:17 PM, Shaun McDonald o...@shaunmcdonald.me.uk wrote: GIT --- http://github.com/migurski/paperwalking Cool. I've patched my fork here with this functionality: http://github.com/avar/paperwalking Sent a pull request to migurski/paperwalking. ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Tuesday 10 November 2009, Ævar Arnfjörð Bjarmason wrote: Cool. I've patched my fork here with this functionality: http://github.com/avar/paperwalking Sent a pull request to migurski/paperwalking. If only JOSM development were so flexible and easy. /me runs and hides. robert. ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Tue, 10 Nov 2009, Robert Scott wrote: On Tuesday 10 November 2009, Ævar Arnfjörð Bjarmason wrote: Cool. I've patched my fork here with this functionality: http://github.com/avar/paperwalking Sent a pull request to migurski/paperwalking. If only JOSM development were so flexible and easy. /me runs and hides. Aiming with my long range rifle ... Do you wanna excuse? 10 .. 9 .. 8 .. Ciao -- http://www.dstoecker.eu/ (PGP key available)___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Tue, 2009-11-10 at 17:54 +0100, Dirk Stöcker wrote: P.S. When I last tried git I found it very frustrating to reach otherwise very easy tasks. It may be optimal for distributed development, but makes the normal development more complicated. It has a very steep learning curve which I think is getting better. But it's quite useful even for simple projects that only have one developer. I'd love if JOSM were in git, but I'm not holding my breath. :) -- Dave ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] Please add the walkingpapers description to the scan-info section in the HTML source for JOSM
On Tuesday 10 November 2009, Dirk Stöcker wrote: If only JOSM development were so flexible and easy. /me runs and hides. Aiming with my long range rifle ... Do you wanna excuse? 10 .. 9 .. 8 .. In all seriousness, it would make life a lot easier for those of us who submit patches that people don't seem to have time to review[1], as it would allow us to continue developing in parallel until our branches got merged. With svn, if your patches aren't getting merged to upstream, you have to start doing horrible manual patch management. Or something involving svn tricks that I don't know about. DVCS raises the status of potential contributors bringing a patch democracy compared to svn's patch serfdom. I'm personally an advocate of Mercurial/bitbucket.org over git/github.org, as I find it easier to use and understand. And Mercurial is supposed to work better for windows users (I personally don't know). robert. [1] ahem https://josm.openstreetmap.de/ticket/3832 ___ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/josm-dev
