Migration from subversion to git

[awy]

Over the next few weeks we will be migrating from subversion to git for source-code management of the Squeezebox code. We have several different repositories and they will be migrated in stages.

The first repo to be migrated will be the jive one. This contains the firmware on the newer players (Radio, Touch and the Controller). The existing repo will be split into several smaller repos, the important ones of which will be squeezeos and squeezeplay.

This migration is now under way. The existing subversion repository is now read-only: http://svn.slimdevices.com/jive. We will make public mirrors of the relevant repos available via GitHub (http://github.com/logitech). We have not yet worked out the mechanics to enable community members who currently have checkin rights to provide changes but we will be doing that shortly.

I'll post updates in due course.

Alan.

[JJZolx]

Are the public mirrors only for those with read-only access, or will checkins also go through them?

Why the need for mirrors? Are there that many people accessing the current server(s)?

[Philip Meyer]

What was the problem with Subversion? I thought it was working well.

[awy]

Are the public mirrors only for those with read-only access, or will checkins also go through them?

Not sure yet. Probably to be achieved via a fork or forks of the github repo.

Why the need for mirrors? Are there that many people accessing the current server(s)?

Because there are private branches in the main repo.

[awy]

What was the problem with Subversion? I thought it was working well.

The branch-merge stuff with svn and svk is awkward and there are many things that git offers. We also plan to use gerrit internally.

[gharris999]

Awy:

Will you post instructions for checking out the source from git once your transition is complete?

[ralphy]

Rockbox has a good git/gerrit usage page that could be used as a template.

http://www.rockbox.org/wiki/UsingGit

[Phil Meyer]

>Will you post instructions for checking out the source from git once
>your transition is complete?
>
For Windows, TortoiseGit seems encouraging: http://code.google.com/p/tortoisegit/

[gharris999]

The only real trouble I've had with git is figuring out how to pull down the latest code from the repo, overwriting any local changes. Is this what I should be doing?

# git stash save --keep-index
# git stash drop
# git pull --rebase


The other thing I'm used to doing via svn is checking out just a part of a repo, e.g.:

SOURCEREPO='http://svn.slimdevices.com/repos/slim/7.7/trunk/server'
svn co $SOURCEREPO /usr/share/lms/server

..i.e. just enough of the code for a runnable lms, skipping all the other, non-essential stuff. Will I be able to do something like that using git? My very limited git experience has had me thus far only checking out an entire trunk of a project.

[andynormancx]

If you really want to discard your local changes then you want:

git reset --hard
git clean -fd
git pull

(though you might want something other than a plain pull depend on what you are up to)