Development/Tutorials/Git/git-svn - Revision history

AnneW: moved Archive:Development/Tutorials/Git/git-svn to Development/Tutorials/Git/git-svn: revert

2012-03-24T19:34:39Z

moved Archive:Development/Tutorials/Git/git-svn to Development/Tutorials/Git/git-svn: revert

AnneW: moved Development/Tutorials/Git/git-svn to Archive:Development/Tutorials/Git/git-svn

2012-03-24T19:17:26Z

moved Development/Tutorials/Git/git-svn to Archive:Development/Tutorials/Git/git-svn

Neundorf at 20:28, 28 April 2011

2011-04-28T20:28:00Z

Neundorf at 20:24, 28 April 2011

2011-04-28T20:24:29Z

Odysseus at 14:08, 1 March 2011

2011-03-01T14:08:26Z

RazZziel: adding hint to use -r HEAD

2010-02-08T09:43:29Z

adding hint to use -r HEAD

Chani: add some stuff back in, clear up some things

2009-12-16T16:13:38Z

add some stuff back in, clear up some things

Majewsky: massive rewrite based on my own experiences

2009-12-15T22:35:15Z

massive rewrite based on my own experiences

Chani: git-stash instructions moved

2009-11-02T02:40:25Z

git-stash instructions moved

Chani: more intro and outro

2009-11-02T00:49:49Z

more intro and outro

@@ Line 43: / Line 43: @@
 After sending your commits to the svn server, git-svn will download all new commits (essentially running 'git svn rebase').
-This rebase won't work if you have local, uncommitted changes. If that becomes inconvenient, you should use [[Development/Tutorials/Git/Intermediate|git stash]].
+This rebase won't work if you have local, uncommitted changes. If that becomes inconvenient, you should use [[Development/Git/Recipes#Stashing_Changes|git stash]].
 Usually, you will be working in feature branches. When you want to commit them to SVN, you will rebase them onto master or merge them into master, and then do the following from the master branch:

← Older revision		Revision as of 20:24, 28 April 2011
Line 58:		Line 58:

	[TODO: apparently --no-ff is better than squash but it has.. quirks]		[TODO: apparently --no-ff is better than squash but it has.. quirks]
−
−	~~See [[Development/Tutorials/Git/BestPractices]] for guidelines on when to squash.~~


	Now that you've got a git-svn repository set up, you can read about [[Development/Tutorials/Git/Basics\|Git Basics]] if you haven't already.		Now that you've got a git-svn repository set up, you can read about [[Development/Tutorials/Git/Basics\|Git Basics]] if you haven't already.

← Older revision		Revision as of 14:08, 1 March 2011
Line 1:		Line 1:
		+	{{warning\|This page is yet to be reviewed for changes required by the migration to Git. Information and commands on this page may no longer be valid and should be used with care. Please see the [[Development/Git\|KDE Git hub page]] for more details. }}
		+
	More and more KDE developers are using git-svn to contribute to KDE's SVN repository. Git-svn allows you to create a local git repository based on an existing svn repository. This allows you to use some (but not all) of git's useful features. It's very useful if you want to commit code on an airplane. ;)		More and more KDE developers are using git-svn to contribute to KDE's SVN repository. Git-svn allows you to create a local git repository based on an existing svn repository. This allows you to use some (but not all) of git's useful features. It's very useful if you want to commit code on an airplane. ;)

@@ Line 27: / Line 27: @@
 The number given to "git svn fetch" on the second-to-last line is the first revision that will be fetched. At this point, the differences between SVN and Git become apparent. While "svn checkout" only reads the current state of the repository, Git wants to read the whole history. But KDE's repository is big. Very big. In fact, it's exorbitantly huge.
-To reduce unnecessary load on KDE's server infrastructure, we instruct git-svn to fetch only those revisions that are older than revision no. 1000000, which is a sensible default at the time of this writing (December 2009, current revision ~1060000). The current SVN revision can be found at http://websvn.kde.org (take a look at the line "Directory revision" just below the header). You can also choose exactly the current SVN revision if you're absolutely sure that you will not be needing any history ("git log", "git blame" and Co. might then not behave as expected).
+To reduce unnecessary load on KDE's server infrastructure, we instruct git-svn to fetch only those revisions that are older than revision no. 1000000, which is a sensible default at the time of this writing (December 2009, current revision ~1060000). The current SVN revision can be found at http://websvn.kde.org (take a look at the line "Directory revision" just below the header). You can also choose exactly the current SVN revision with "-r HEAD", if you're absolutely sure that you will not be needing any history ("git log", "git blame" and Co. might then not behave as expected).
 If you're using an older version of git-svn, you may need to specify a revision number that was a commit to the code you're checking out.

@@ Line 28: / Line 28: @@
 To reduce unnecessary load on KDE's server infrastructure, we instruct git-svn to fetch only those revisions that are older than revision no. 1000000, which is a sensible default at the time of this writing (December 2009, current revision ~1060000). The current SVN revision can be found at http://websvn.kde.org (take a look at the line "Directory revision" just below the header). You can also choose exactly the current SVN revision if you're absolutely sure that you will not be needing any history ("git log", "git blame" and Co. might then not behave as expected).
 == Updating ==
@@ Line 39: / Line 40: @@
 == Commiting ==
-{{Box|Work notice|The following two paragraphs are IMHO. Please correct me if my assumptions are wrong. -- [[User:Majewsky|Majewsky]] 22:35, 15 December 2009 (UTC)}}
+After sending your commits to the svn server, git-svn will download all new commits (essentially running 'git svn rebase').
+This rebase won't work if you have local, uncommitted changes. If that becomes inconvenient, you should use [[Development/Tutorials/Git/Intermediate|git stash]].
-You can only push your changes back into KDE's SVN repository when your checkout is current (run "git svn rebase" if you're not sure) or when you have local, uncommitted changes. If the latter becomes inconvenient, you should use [[Development/Tutorials/Git/Intermediate|git stash]].
 Usually, you will be working in feature branches. When you want to commit them to SVN, you will rebase them onto master or merge them into master, and then do the following from the master branch:
@@ Line 54: / Line 54: @@
 git merge --squash mybranch
 </pre>
 See [[Development/Tutorials/Git/BestPractices]] for guidelines on when to squash.

@@ Line 1: / Line 1: @@
-More and more kde developers are using git-svn to contribute to KDE's SVN repository. Git-svn allows you to create a local git repository based on an existing svn repository. This allows you to use some (but not all) of git's useful features. It's very useful if you want to commit code on an airplane. ;)
+More and more KDE developers are using git-svn to contribute to KDE's SVN repository. Git-svn allows you to create a local git repository based on an existing svn repository. This allows you to use some (but not all) of git's useful features. It's very useful if you want to commit code on an airplane. ;)
-<strong>Note:</strong> Please make sure to use Git 1.5.4 or better when you are interfacing with SVN. older versions of git-svn have many issues you might run into otherwise.
+<strong>Important notes:</strong>
-<strong>Note:</strong> git-svn is not able to track most of the svn:properties yet. So, svn:externals are not fetched.
+This page explains how to fetch [http://edu.kde.org kdeedu] trunk from and import it into Git. It will then demonstrate how to make use of Git's features and sync with SVN again.
-Here I'm going to explain to you how to fetch [http://edu.kde.org KDE-EDU]-trunk and import it into Git. I will then demonstrate how to make use of Git's features and sync with SVN again.
+{{Box|Further reading|If terms like "rebase" and "branch" do not mean anything to you, you should read a tutorial on general Git usage and workflows first, e.g. the [[Development/Tutorials/Git/Basics|Git Basics]] page on this wiki.}}
 <pre>
 git svn init https://svn.kde.org/home/kde/trunk/KDE/kdeedu
-git svn fetch -r798745
+# For those using SSH authentication:
 </pre>
-For those who don't have a password set up for https access, or who would rather use the more traditional SSH+SVN approach an alternate initialization line for the git repository (replace USERNAME with your username).
+The number given to "git svn fetch" on the second-to-last line is the first revision that will be fetched. At this point, the differences between SVN and Git become apparent. While "svn checkout" only reads the current state of the repository, Git wants to read the whole history. But KDE's repository is big. Very big. In fact, it's exorbitantly huge.
-<pre>
+To reduce unnecessary load on KDE's server infrastructure, we instruct git-svn to fetch only those revisions that are older than revision no. 1000000, which is a sensible default at the time of this writing (December 2009, current revision ~1060000). The current SVN revision can be found at http://websvn.kde.org (take a look at the line "Directory revision" just below the header). You can also choose exactly the current SVN revision if you're absolutely sure that you will not be needing any history ("git log", "git blame" and Co. might then not behave as expected).
-git svn init svn+ssh://USERNAME@svn.kde.org/home/kde/trunk/KDE/kdeedu
-</pre>
-−
-The revision has to be an existing revision of the module (to be found [http://websvn.kde.org/trunk/KDE/ here]).
-To later update (sync with SVN) do:
+== Updating ==
 <pre>
 git svn rebase
 </pre>
-Now you can start hacking. :)
+== Commiting ==
-Whenever you want you can use this command to push your changes back into KDE's SVN repository:
 <pre>
@@ Line 33: / Line 49: @@
 </pre>
-Be warned, Git will create one SVN commit for each commit in your Git repository. To create just <b>one</b> commit for the whole merge of a branch into the master branch use the "--squash" feature like this:
+Git will create one SVN commit for each commit in your Git repository. To create just <b>one</b> commit for the whole merge of a branch into the master branch use the "--squash" feature like this:
 <pre>
@@ Line 39: / Line 55: @@
 </pre>
-see [[Development/Tutorials/Git/BestPractices]] for guidelines on when to squash.
+See [[Development/Tutorials/Git/BestPractices]] for guidelines on when to squash.
-−
-Note: git-svn cannot sync with SVN when you have local, uncommited changes. If this becomes inconvenient you should use [[Development/Tutorials/Git/Intermediate|git stash]].
-−
-Now that you've got a git-svn repository set up, you can read about [[Development/Tutorials/Git/Basics|Git Basics]].