HowTo:Checkout GIT - Revision history

Ermo: /* Set up */ Make Boost v1.53 the preferred version

2017-02-18T10:28:15Z

‎Set up: Make Boost v1.53 the preferred version

Ermo: Update link to svn repo

2017-02-18T10:21:55Z

Update link to svn repo

Nikai: sp

2010-12-27T12:34:35Z

Breese: Removed boost 1.28

2010-12-25T14:30:28Z

Removed boost 1.28

Breese: Upgraded to boost 1.45

2010-12-25T12:36:56Z

Upgraded to boost 1.45

Breese: Submit

2010-12-24T12:01:49Z

Submit

Breese: Synchronize

2010-12-24T11:43:58Z

Synchronize

Breese: Initial version

2010-12-24T11:29:33Z

Initial version

New page

This page describes how to use GIT with the Vega Strike SVN repository.

[http://git-scm.com/ GIT] is a distributed sourcecode revision control system, which allows you to commit changes to a local repository and from there commit the changes to the remove Vega Strike SVN repository.
This is useful if you want to experiment with the codebase, or if you do not have commit privileges to the Vega Strike SVN repository.

If you are unfamiliar with GIT, the you should start by reading the [https://git.wiki.kernel.org/index.php/GitSvnCrashCourse GIT SVN Crash Course].

== Installation ==
First you need to install the GIT and GIT-SVN packages. How you do this, depends on your system.

See the [http://book.git-scm.com/2_installing_git.html chapter 2] in the GIT Book.

== Set up ==
After installing the two packages above, you have to set up a local git repository for the Vega Strike codebase.

Normally git-svn will copy the full svn repository, that is all revisions of all files.
This takes takes a long time, and as you seldomly need the full history, you can instead copy from a given revision onwards.

This command will only copy the most recent revision. If you want the full history, remove the "-rHEAD" option:
<pre>
git svn clone -rHEAD https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/vegastrike/
</pre>

Next you need to handle svn:externals. You can find them with "git svn show-externals". There may be a better way using git submodules, but this works:
<pre>
git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_28_0/boost/boost/ boost/1_28/boost
git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_28_0/boost/libs/python/src/ boost/1_28/src
git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/boost/ boost/1_35/boost
git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/libs/python/src/ boost/1_35/src
</pre>

Now you are almost ready to work on the codebase. You just need to create a branch to work on. This will make it easier to keep your local GIT repository synchonized with the remote SVN repository.

git branch ''insert-your-branch-name''
git checkout ''insert-your-branch-name''

Replace ''insert-your-branch-name'' with the name that you want to call your branch.

From here on, you can follow the normal build instructions.

@@ Line 23: / Line 23: @@
 Next you need to handle svn:externals. You can find them with "git svn show-externals". There may be a better way using git submodules, but this works.
 <pre>
 git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/boost/ boost/1_35/boost
@@ Line 32: / Line 38: @@
 We recommend that you add the following lines to your .gitignore file, which should be created in the same directory as the .git directory is located.
 <pre>
 boost/1_35
 boost_patched_gcc44
 </pre>

@@ Line 15: / Line 15: @@
 Normally git-svn will copy the full svn repository, that is all revisions of all files.
-This takes takes a long time, and as you seldomly need the full history, you can instead copy from a given revision onwards.
+This takes takes a long time, and as you seldom need the full history, you can instead copy from a given revision onwards.
 This command will only copy the most recent revision. If you want the full history, remove the "-rHEAD" option:
@@ Line 38: / Line 38: @@
 You may also want to add auto-generated files to .gitignore.
-Now you are almost ready to work on the codebase. You just need to create a branch to work on. This will make it easier to keep your local GIT repository synchonized with the remote SVN repository.
+Now you are almost ready to work on the codebase. You just need to create a branch to work on. This will make it easier to keep your local GIT repository synchronized with the remote SVN repository.
   git branch ''insert-your-branch-name''
@@ Line 47: / Line 47: @@
 From here on, you can follow the normal build instructions.
-== Synchonize with SVN ==
+== Synchronize with SVN ==
 If others commit changes to the remote SVN repository, you can update your local GIT repository as follows.

@@ Line 24: / Line 24: @@
 Next you need to handle svn:externals. You can find them with "git svn show-externals". There may be a better way using git submodules, but this works.
 <pre>
 git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/boost/ boost/1_35/boost
 git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/libs/python/src/ boost/1_35/src
@@ Line 34: / Line 32: @@
 We recommend that you add the following lines to your .gitignore file, which should be created in the same directory as the .git directory is located.
 <pre>
 boost/1_35
 boost/1_45

← Older revision		Revision as of 12:01, 24 December 2010
Line 61:		Line 61:
	git checkout ''insert-your-branch-name''		git checkout ''insert-your-branch-name''
	git pull . master		git pull . master
		+
		+	== Submit your changes ==
		+	The "git commit" operation only commits your changes to your local GIT repository. When you want to submit your changes to the remote SVN repository, then you have two options.
		+	If you have commit privileges to the Vega Strike SVN repository, then you can use the "git svn dcommit" command. Otherwise you have to submit a patch to the Vega Strike forums.
		+
		+	You can either use
		+
		+	git diff --no-prefix master..''insert-your-branch-name'' > mypatch.diff
		+
		+	Better yet, you can use the following bash script, which will make sure that the output looks like an SVN patch.
		+	<pre>
		+	#!/bin/sh
		+	#
		+	# git-svn-diff
		+	# Generate an SVN-compatible diff against the tip of the tracking branch
		+	TRACKING_BRANCH=`git config --get svn-remote.svn.fetch \| sed -e 's/.*:refs\/remotes\///'`
		+	REV=`git svn find-rev $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH)`
		+	git diff --no-prefix $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH) $* \|
		+	sed -e "s/^+++ ./& (working copy)/" -e "s/^--- ./& (revision $REV)/" \
		+	-e "s/^diff --git [^[:space:]]*/Index:/" \
		+	-e "s/^index.*/===================================================================/"
		+	</pre>
		+	For a more complete script see [https://gist.github.com/710219 git-svn-diff.sh].

@@ Line 19: / Line 19: @@
 This command will only copy the most recent revision. If you want the full history, remove the "-rHEAD" option:
 <pre>
-git svn clone -rHEAD https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/vegastrike/
+git svn clone -rHEAD https://svn.code.sf.net/p/vegastrike/code/trunk/vegastrike/
 </pre>

@@ Line 5: / Line 5: @@
 If you are unfamiliar with GIT, the you should start by reading the [https://git.wiki.kernel.org/index.php/GitSvnCrashCourse GIT SVN Crash Course].
 == Installation ==
@@ Line 11: / Line 10: @@
 See the [http://book.git-scm.com/2_installing_git.html chapter 2] in the GIT Book.
 == Set up ==
@@ Line 24: / Line 22: @@
 </pre>
-Next you need to handle svn:externals. You can find them with "git svn show-externals". There may be a better way using git submodules, but this works:
+Next you need to handle svn:externals. You can find them with "git svn show-externals". There may be a better way using git submodules, but this works.
 <pre>
 git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_28_0/boost/boost/ boost/1_28/boost
@@ Line 31: / Line 29: @@
 git svn clone -rHEAD http://svn.boost.org/svn/boost/tags/release/Boost_1_35_0/libs/python/src/ boost/1_35/src
 </pre>
 Now you are almost ready to work on the codebase. You just need to create a branch to work on. This will make it easier to keep your local GIT repository synchonized with the remote SVN repository.
@@ Line 40: / Line 46: @@
 From here on, you can follow the normal build instructions.