git repos for OpenWorkouts development

[borja]

Create a clone of the darcs repos, but in git, so more developers could be involved in the development.

Steps:

1. create git repos from darcs repos (more info here: ​http://darcs.net/Using/Convert)

2. integrate git repos into trac

3. create scripts to make maintainers life easier to merge changes from darcs to git and vice-versa

4. maybe add hooks to automatically merge changes darcs<->git on push?

[borja]

So, we have a git repo now (source:OpenWorkouts-git)

Instructions to work with git:

1. Grab a copy of the repo. Given you have the proper setup for ssh access to the server already:

git clone ssh://openworkouts/home/repos/git/OpenWorkouts-current

2. Create a branch to work on whatever feature you want to work in. For example, to work on the task #8 (Galleries for workouts):

git branch 8-galleries-for-workouts

git checkout 8-galleries-for-workouts

3. Work on your branch, push to the server whenever you feel like it (please try to commit and push only more or less finished code, no WIP or temporary code). Once you are done working on that branch, update the ticket with a comment pointing to the branch in the repo (see TracLinks to see how to automatically reference a git branch in your comments) and send an email to the mailing list asking for review.

Once your contribution has been reviewed and accepted, a committer will merge the changes back to the master branch and then to the main darcs repo.

[borja]

For admins, this is the workflow to sync changes from darcs to git:

1. Setup git repos. We need to clone the source:OpenWorkouts-git repo and create an empty repo for syncing:

cd repos/git
git clone ssh://openworkouts/home/repos/git/OpenWorkouts-current
git init OpenWorkouts-darcs2git
touch git.marks

2. Export patches from darcs:

cd repos/OpenWorkouts-current
darcs convert export --read-marks ../darcs.marks --write-marks ../darcs.marks > ../darcs.export

3. Import changes in git (do it every time you do export from darcs):

cd repos/git/OpenWorkouts-darcs2git
git fast-import --import-marks=../git.marks --export-marks=../git.marks < ../../darcs.export
git checkout master .

4. Merge changes into the main repo

cd repos/git/OpenWorkouts-current
git pull ../OpenWorkouts-darcs2git

The pull will make a merge commit, as changes coming from that repo will be treated as pull from a different branch. Once that is commited:

git push

[borja]

We haven't imported changes from git into darcs (yet). I'll update this ticket when that happens, but for now we can close it.