Changes between Version 7 and Version 8 of GitMigrationProposal

Timestamp:

03/15/09 06:16:20 (4 years ago)

Author:

cdavid

Comment:

--

GitMigrationProposal

@@ -3 +3 @@
 [[PageOutline]]
 
-= Rationale for git = 
 
-Comparison with bzr / hg, problems of svn.
-
-= How to do the migration = 
-
-The migration from svn repository to git repository should keep as mush information from svn as possible: history, tags and branches.
-
-== Tool for the migration ==
-
-svn-all-fast-export: see http://repo.or.cz/w/svn-all-fast-export.git
-
-This is an exporter coded by KDE people to handle KDE migration - thus, it can certainly handle numpy and scipy. It can skip some branches, or paths outside the usual trunk/branches/tags (f2py-research, for example), and export svn "tags" as real tags.
-
-== usage ==
-
-For numpy, the following seems to work - it ignores branches outside the /branches namespace, convert the tags.
-
-{{{
-#!
-create repository myproject
-end repository
-
-match /trunk/
-  repository myproject
-  branch master
-end match
-
-# Ignore extra 'repositories' which are not numpy code, but were in numpy
-# repository.
-match /f2py-research/
-end match
-match /vendor/
-end match
-match /numpy.sunperf/
-end match
-match /cleaned_math_config/
-end match
-match /numpy-docs/
-end match
-
-# Take usual svn branches
-match /branches/([^/]+)/
-  repository myproject
-  branch \1
-end match
-
-# This rule will create tags that don't exist in any of the
-# branches. It's not what you want.
-# See the merged-branches-tags.rules file
-match /tags/([^/]+)/
-  repository myproject
-  branch refs/tags/\1
-end match
-}}}
 
 = Common scenario = 
@@ -104 +50 @@
 git config alias.st status
 }}}
+
+=== Getting help from the command line ===
+
+Git documentation is pretty massive - it can definitely be difficult to apprehend. Once you have a good grasp of the basic scenario, you should familiarize yourself with git from the git tutorial, and git for svn users. Only then will you be able to start reading the git included help. 
 
 == Scenario 1: getting the numpy source code ==
@@ -157 +107 @@
 
 No, don't use git reset. Git reset can be used to revert changes, but can be dangerous to use, as it can also remove *commits*, not just changes. git reset is only useful for advanced usage of git. Use git stash or git co, not git reset.
+
+= Rationale for git = 
+
+Comparison with bzr / hg, problems of svn.
+
+= How to do the migration = 
+
+The migration from svn repository to git repository should keep as mush information from svn as possible: history, tags and branches.
+
+== Tool for the migration ==
+
+svn-all-fast-export: see http://repo.or.cz/w/svn-all-fast-export.git
+
+This is an exporter coded by KDE people to handle KDE migration - thus, it can certainly handle numpy and scipy. It can skip some branches, or paths outside the usual trunk/branches/tags (f2py-research, for example), and export svn "tags" as real tags.
+
+== usage ==
+
+For numpy, the following seems to work - it ignores branches outside the /branches namespace, convert the tags.
+
+{{{
+create repository myproject
+end repository
+
+match /trunk/
+  repository myproject
+  branch master
+end match
+
+# Ignore extra 'repositories' which are not numpy code, but were in numpy
+# repository.
+match /f2py-research/
+end match
+match /vendor/
+end match
+match /numpy.sunperf/
+end match
+match /cleaned_math_config/
+end match
+match /numpy-docs/
+end match
+
+# Take usual svn branches
+match /branches/([^/]+)/
+  repository myproject
+  branch \1
+end match
+
+# This rule will create tags that don't exist in any of the
+# branches. It's not what you want.
+# See the merged-branches-tags.rules file
+match /tags/([^/]+)/
+  repository myproject
+  branch refs/tags/\1
+end match
+}}}