[Potlatch-dev] Codebase and git

Andy Allan gravitystorm at gmail.com
Tue Mar 8 19:25:59 GMT 2011


On Mon, Feb 28, 2011 at 9:31 AM, Richard Fairhurst <richard at systemed.net> wrote:

> In conjunction with this, we will be moving from svn to git (as used for the
> core Rails port). This will allow people to hack on their own improvements
> in parallel until they're ready for integration into the main codebase. Andy
> will be posting a nice git tutorial to the list in readiness (he doesn't
> know this yet ;) ).

Things have progressed today. Thanks to TomH we now have a conversion
of svn to git, and I've written the promised introduction for p2
committers at

http://wiki.openstreetmap.org/wiki/Potlatch_2/Developer_Documentation/git

The OSMF-hosted repo is at

It's hard to strike the balance between being helpful and just giving
the world Yet Another Git Introduction, so I tried to keep it focussed
on what we're up to ourselves.

As part of the migration, we created a number of different topic
branches for the work that happened after RichardF's line-in-the-sand
commit (r25368, aka 7d4f68 now). Some very simple things were added to
the master branch with RichardF's approval, but most went into the
different topics. You can see what went where at

https://gist.github.com/860288

I've already done some more work on my clone of the git repository,
and published them on github at
https://github.com/gravitystorm/Potlatch2 . I don't see myself making
any more commits to SVN from now on, unless something unexpected
happens.

Happy to answer any questions, but remember things are neither set in
stone nor necessarily fully thought-through!

Cheers,
Andy



More information about the Potlatch-dev mailing list