Git migration - Revision history

TomYu at 17:02, 5 July 2012

2012-07-05T17:02:43Z

TomYu: Fix Git URLs post-update

2012-05-14T18:35:36Z

Fix Git URLs post-update

TomYu: Update post-migration

2012-05-14T18:06:58Z

Update post-migration

TomYu at 22:41, 7 May 2012

2012-05-07T22:41:45Z

TomYu at 22:03, 7 May 2012

2012-05-07T22:03:02Z

TomYu at 21:50, 7 May 2012

2012-05-07T21:50:06Z

TomYu: New page: 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 t...

2012-05-07T21:38:41Z

New page: 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 t...

New page

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 <code>git clone</code>)
* The local branch that you want to rebase is named "master".

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

== 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

← Older revision		Revision as of 17:02, 5 July 2012
Line 19:		Line 19:

	Using <code>git rebase --onto</code> may not necessarily work well if your local branch has merge commits in it.		Using <code>git rebase --onto</code> may not necessarily work well if your local branch has merge commits in it.
		+
		+	== Switching from a krb5-anonsvn.git GitHub fork to a krb5.git GitHub fork ==
		+
		+	You may want to switch some of your work from a GitHub fork based off of krb5-anonsvn.git to a GitHub fork based off of krb5.git. The following example assumes:
		+
		+	* You have your own GitHub repository (assuming your GitHub username is "myname") forked from krb5.git (the new official krb5 repository mirror)
		+	* You have some work in your own GitHub repository forked from krb5-anonsvn.git (the old krb5 repository mirror from anonsvn) in a branch named "mybranch" that is based on the "master" branch of krb5-anonsvn.git.
		+
		+	<pre>
		+	git clone git://github.com/myname/krb5.git
		+	cd krb5
		+	git remote add anon git://github.com/myname/krb5-anonsvn.git
		+	git fetch anon
		+	git checkout -b mybranch anon/mybranch
		+	git rebase --onto origin/master anon/master
		+	</pre>

	== Using the new repository ==		== Using the new repository ==

@@ Line 1: / Line 1: @@
-The main krb5 source repository will be migrating from Subversion to Git, targeting the weekend of 2012-05-11. More general information about accessing the new repository is at:
+The main krb5 source repository migrated from Subversion to Git during the weekend of 2012-05-11. More general information about accessing the new repository is at:
 * [[Getting source code]].
 == 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, but normally the disjoint histories will prevent a normal rebase from working due to merge conflicts.
+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 history of the krb5-anonsvn repository. It is possible to rebase existing local work that was based off the krb5-anonsvn repository, but normally the disjoint histories will prevent a normal rebase from working due to merge conflicts.
 The following example makes these assumptions:
@@ Line 22: / Line 22: @@
 == Using the new repository ==
-Some draft procedures for interacting with the new repository are at:
+Some procedures for interacting with the new repository are at:
 * [[Coding style/Version control practices]]

← Older revision		Revision as of 22:03, 7 May 2012
Line 1:		Line 1:
−	The main krb5 source repository will be migrating from Subversion to Git, targeting the weekend of 2012-05-11.	+	The main krb5 source repository will be migrating from Subversion to Git, targeting the weekend of 2012-05-11. More general information about accessing the new repository is at:
		+	* [[Getting source code]].

	== Rebasing existing krb5-anonsvn forks ==		== Rebasing existing krb5-anonsvn forks ==

@@ Line 4: / Line 4: @@
 == 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 history of the krb5-anonsvn repository. It is possible to rebase existing local work that was based off the krb5-anonsvn repository, but normally the disjoint histories will prevent a normal rebase from working due to merge conflicts.
+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 has a history that is disjoint from the history of the krb5-anonsvn repository. It is possible to rebase existing local work that was based off the krb5-anonsvn repository, but normally the disjoint histories will prevent a normal rebase from working due to merge conflicts.
 The following example makes these assumptions:
@@ Line 11: / Line 11: @@
 <pre>
-git remote add krb5-test git://github.com/krb5/krb5-test
+git remote add krb5 git://github.com/krb5/krb5.git
-git fetch krb5-test
+git fetch krb5
-git rebase --onto krb5-test/master origin/master
+git rebase --onto krb5/master origin/master
 </pre>

@@ Line 7: / Line 7: @@
 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 <code>git clone</code>)
-* The local branch that you want to rebase is named "master".
+* The local branch that you want to rebase is based off of "origin/master"
 <pre>
@@ Line 14: / Line 14: @@
 git rebase --onto krb5-test/master origin/master
 </pre>
 == Using the new repository ==