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

[Brett Henderson]

Hi Igor,

On Tue, Sep 20, 2011 at 1:12 AM, Igor Podolskiy <
igor.podolskiy at vwi-stuttgart.de> wrote:

> 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.


Okay, thanks.  Now I understand.  I'm not sure which way to go to be
honest.  On the one hand using individual repositories makes me less central
to the project because everybody is a peer, but on the other hand having a
single central repository with multiple committers also makes me less
central because the repository I publish won't have my name on it :-)

I'm still leaning towards invididual repositories.  I like the anarchist
approach where anybody can pick up and run in a new direction without being
a "non-official" fork.  The biggest downside I can see is that individual
repositories are not as discoverable as a bunch of repositories under the
openstreetmap organisation.

The Hudson server will require some work also.  I'm not sure whether it
should create tags based on an automated build (as it currently does) or
whether it should simply build off pre-existing tags.  The former seems
better, but is more complicated.


>
>
>  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<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].


Oops.  I used your ant scripts as an example but forgot to include that
bit.  I'll take a look at it soon.

I'm going to re-implement the migration scripts.  My existing approach lost
branch information from Subversion and trying to fix svn:mergeinfo tags to
re-create it will be very difficult.  I've also realised that my old scripts
didn't create annotated tags, just lightweight tags (I didn't realise there
was a difference).  I've created a second set of scripts that use GIT
features to re-build the history.  It has preserved branches correctly, but
I haven't obtained the tags yet.

I'm no longer using my SVN repo for hosting the migration scripts.  They're
here:
https://github.com/brettch/osmosis-svn-to-git

I'll post a new migrated repo over the next week or two when I finally get
around to finishing it.

Brett
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/osmosis-dev/attachments/20110920/8a71f8c9/attachment.html>