[osmosis-dev] Version Control Full History and GIT Test

Igor Podolskiy igor.podolskiy at vwi-stuttgart.de
Mon Sep 19 16:12:02 BST 2011


Hi Brett,

> I'm a bit confused :-) What does the openstreetmap organisation provide?
> Can't I just upload the repo under my own user id and let people fork
> from there as they see fit?
Sure you can do that. As far as I understand, the "organization" gives 
you the benefit of having multiple users have write access to a 
repository - in your repository, only you are able to push.

If you add it to an organization, it will be more or less like 
Subversion now: all members of the organization would be able to 
directly push to that repository, i.e. there will be "Official OSM 
Developers' Osmosis tree" and "other trees". If you just upload it to 
brettch/osmosis, it will be "Official Brett's Osmosis tree" and "other 
trees". So in the end, it's just about how you label the "official" 
sources, how important this "official" label is for you and who can push 
to it.

> I've uploaded a test repository to github. It contains full history from
> day one (April 4th, 2007) including all tags that were ever created. Let
> me know if you see any issues with it.
> https://github.com/brettch/osmosis-test
Looks good to me, just checked it out and played around with it, the 
tags worked fine, the history too. It did build ("ant publish") like a 
charm, also.

I also tested your last commit with the git support for version string 
generation (not yet in the osmosis-test on GitHub). Unfortunately, it 
doesn't work on Windows (MSysGit) in its current state.

The reason for this: The "git" binary is actually a batch script called 
"git.cmd" in msysgit. "git" works fine on the command line, but for some 
reason, when Ant does an <exec executable="git" /> it fails with a "file 
not found" error even if it is in your PATH. If you <exec 
executable="git.cmd"/>, it works. My solution for this was to add a 
condition to my ant script like this:

<condition property="git.command" value="git.cmd">
   <os family="windows" />
</condition>
<condition property="git.command" value="git">
   <not><os family="windows" /></not>
</condition>

<exec executable="${git.command}" ... />

I would agree that this is somewhat ugly, but it worked for me[TM].

> One thing I'm unsure about is the list of email addresses in the
> history. Once I've done the migration I can't change them. This is my
> current list. Getting them right gives the advantage of allowing github
> to match commits to github users.
> https://www.bretth.com/repos/main/osmosis-svn-to-git/users.txt
My address is correct, I can't speak for the others :)

Greetings from Stuttgart
Igor



More information about the osmosis-dev mailing list