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

[Brett Henderson]

On Thu, Sep 8, 2011 at 8:36 PM, Brett Henderson <brett at bretth.com> wrote:

> Hi Igor,
>
> On Thu, Sep 8, 2011 at 1:01 AM, Igor Podolskiy <
> igor.podolskiy at vwi-stuttgart.de> wrote:
>
>> Hi Brett,
>>
>>   • I'm pondering a move to GIT.  Primarily because it gives people a
>>>
>>> better opportunity to experiment with the codebase.  Secondly because I
>>> am experimenting with GIT anyway and wanted a real-world task to work
>>> with.
>>>
>>> [...]
>>>
>>>
>>> Any thoughts re a possible GIT move?
>>>
>> that would be _really_ cool. In fact, I've been running more or less of a
>> mirror of the latest revisions of Osmosis trunk on Github [1]. It is really
>> much simpler to work and try things out and keep track of upstream and so on
>> than with SVN. There's even a place for a GIT repository already, the
>> Openstreetmap organization on GitHub [2].
>>
>
> I'll check those links out.  I know very little about GitHub (or Git for
> that matter) so I don't know how users, organisations, etc work.
>

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?


>
>
>>
>> The only thing we'd need to change would be the build script for the
>> snapshot version string - currently it uses the SVN revision. In
>> osmosis-fastused, I already made a similar Ant build script which uses the
>> git revision (or tag, if available), to be found here [3].
>>
>
> Cool, thanks for that.
>
> I still have some work to do before I have a complete migration tool.  I
> think my re-built SVN repo is looking good but I need to do all the GIT
> merge steps now including preservation of existing tags.  As soon as I get
> that working I'll incorporate your build changes.
>

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

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

I've used up my Osmosis time quota for now, but I'll take a look at the ant
build over the coming days.

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