Difference between revisions of "Git migration"

Revision as of 16:38, 7 May 2012

The main krb5 source repository will be migrating from Subversion to Git, targeting the weekend of 2012-05-11.

Rebasing existing krb5-anonsvn forks

Some collaborators have forked the existing krb5-anonsvn repository on GitHub. The conversion process involves making some history edits to make the log messages more readable in typical Git tools. While this will provide a better experience for Git users going forward, the new repository will have a history that is disjoint from the krb5-anonsvn repository. It is possible to rebase existing local work that was based off the krb5-anonsvn repository.

The following example makes these assumptions:

• Your Git remote for the krb5-anonsvn repository is named "origin" (which is probably true if you created your local repository using git clone)
• The local branch that you want to rebase is named "master".

git remote add krb5-test git://github.com/krb5/krb5-test
git fetch krb5-test
git rebase --onto krb5-test/master origin/master

Using the new repository

Some draft procedures for interacting with the new repository are at:

• Coding style/Version control practices

This includes advice for committers and for contributors who are preparing contributions using a GitHub fork (or other downstream Git repository).

Conversion process details

Additional information about the process of converting the repository from Subversion to Git:

• Git conversion

Relevant mailing list messages

• http://mailman.mit.edu/pipermail/krbdev/2012-April/010803.html