Projects/Marble/GsocGit - Revision history

Neundorf at 20:22, 28 April 2011

2011-04-28T20:22:35Z

Earthwings at 21:20, 4 April 2011

2011-04-04T21:20:52Z

Earthwings: /* Creating Review Requests */

2010-07-20T19:27:32Z

‎Creating Review Requests

Earthwings: /* Further Reading */

2010-07-20T18:10:22Z

‎Further Reading

Hjain: /* Overview */

2010-06-10T08:50:50Z

‎Overview

Earthwings: /* Day-to-Day operations */

2010-06-06T20:20:48Z

‎Day-to-Day operations

Earthwings: /* Local Repository Setup */

2010-06-06T20:16:33Z

‎Local Repository Setup

Earthwings: /* Day-to-Day operations */

2010-06-06T20:10:04Z

‎Day-to-Day operations

Earthwings at 08:04, 6 June 2010

2010-06-06T08:04:34Z

Earthwings: /* Local Repository Setup */

2010-06-06T08:03:33Z

‎Local Repository Setup

@@ Line 118: / Line 118: @@
 == Further Reading ==
-* [[Development/Tutorials/Git]]
+* [[Development/Git]]
-*[http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html The official tutorial introduction to Git]
-* [http://www.gitcasts.com/ Git Screencasts]
-* [http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html Cheat Sheet]

← Older revision		Revision as of 21:20, 4 April 2011
Line 1:		Line 1:
		+	{{warning\|This page is not relevant to GSOC 2011 and later.}}
		+
	This tutorial is a quick introduction to the setup and work with git and gitorious.org in Marble's Google Summer of Code (GSOC) projects. Further details can be found in the links listed in the last section of the page.		This tutorial is a quick introduction to the setup and work with git and gitorious.org in Marble's Google Summer of Code (GSOC) projects. Further details can be found in the links listed in the last section of the page.

@@ Line 99: / Line 99: @@
 Once the data is fetched, you can create the diff. One of the following two methods should work:
 * [http://www.reviewboard.org/docs/manual/dev/users/tools/post-review/ post-review] -n --server=reviewboard.kde.org > mypatch.diff
-* [http://mojodna.net/2009/02/24/my-work-git-workflow.html git-svn-diff] > mypatch.diff
+* [http://nienhueser.de/marble/marble-svn-diff marble-svn-diff] > mypatch.diff
 One of the two commands should give you a patch in the file mypatch.diff. Rename it to a sane name, create a review request and attach the file. Use <tt>/trunk/KDE/kdeedu/marble</tt> as the "Base Directory" it asks you for when uploading the diff.

← Older revision		Revision as of 18:10, 20 July 2010
Line 86:		Line 86:

	You may also rebase the changes (see git tutorials).		You may also rebase the changes (see git tutorials).
		+
		+	== Creating Review Requests ==
		+	In Marble we're using [http://reviewboard.kde.org Review Board] for peer reviews of code. It is a bit picky about the format of patches it accepts, so we need to prepare a bit for it.
		+
		+	First (but only once), you'll have to add the KDE subversion repository to your list of remote repositories and fetch data from it. This is needed to create a patch against the right files, those in the KDE subversion repository. Adding the remote repository takes two steps (replace nienhueser with your KDE Subversion account name):
		+	git svn init svn+ssh://nienhueser@svn.kde.org/home/kde/trunk/KDE/kdeedu/marble
		+	git svn fetch -r 1151760
		+
		+	The revision argument should be a recent KDE Subversion revision number. To find out the most recent one, use (replace username again):
		+	svn info svn+ssh://nienhueser@svn.kde.org/home/kde/trunk/KDE/kdeedu/marble
		+
		+	Once the data is fetched, you can create the diff. One of the following two methods should work:
		+	* [http://www.reviewboard.org/docs/manual/dev/users/tools/post-review/ post-review] -n --server=reviewboard.kde.org > mypatch.diff
		+	* [http://mojodna.net/2009/02/24/my-work-git-workflow.html git-svn-diff] > mypatch.diff
		+
		+	One of the two commands should give you a patch in the file mypatch.diff. Rename it to a sane name, create a review request and attach the file. Use <tt>/trunk/KDE/kdeedu/marble</tt> as the "Base Directory" it asks you for when uploading the diff.

	== Further Reading ==		== Further Reading ==

@@ Line 19: / Line 19: @@
 * Marble developers commit changes to the svn.kde.org repository
 * Earthwings (or another Marble developer) from time to time invokes a script that transports the latest changes to svn.kde.org to the marble/marble.git repository on gitorious.org
-* You (and nobodoy else) can import these changes into your personal clone
+* You (and nobody else) can import these changes into your personal clone
 * You (and nobody else) can import changes to your personal clone on gitorious.org to your local clone. This is only needed if you are working on more than one system.

← Older revision		Revision as of 20:20, 6 June 2010
Line 86:		Line 86:

	You may also rebase the changes (see git tutorials).		You may also rebase the changes (see git tutorials).
		+
		+	== Further Reading ==
		+	* [[Development/Tutorials/Git]]
		+	*[http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html The official tutorial introduction to Git]
		+	* [http://www.gitcasts.com/ Git Screencasts]
		+	* [http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html Cheat Sheet]

← Older revision		Revision as of 20:16, 6 June 2010
Line 47:		Line 47:

	Replace "earthwings" with your Gitorious account. The clone URL can differ; have a look at your personal clone on gitorious.org where the clone URL is listed.		Replace "earthwings" with your Gitorious account. The clone URL can differ; have a look at your personal clone on gitorious.org where the clone URL is listed.
		+
		+	The clone operation you did in gitorious was a one-time operation. It's possible and useful to synchronize changes happening after the clone operation later. For this to work, configure your local repository to list the marble/marble repository as another remote repository:
		+	git remote add mainline git@gitorious.org:marble/marble.git
		+	git fetch mainline

	== Day-to-Day operations ==		== Day-to-Day operations ==

← Older revision		Revision as of 20:10, 6 June 2010
Line 49:		Line 49:

	== Day-to-Day operations ==		== Day-to-Day operations ==
		+	With the local repository set up, you can work with it like you work with any other git repository. This tutorial is not meant to replace the existing git tutorials: Please make sure to read one or more of them if you do not know git yet. See the last section at the end of this page for some nice general git tutorials.
		+
		+	The following operations will be useful while working on your GSOC project.
		+
		+	=== Commit local changes to the local repository ===
		+	Local commits are a great way to keep your development work in order. You do not need an Internet connection for local commits.
		+
		+	Show modified and new files
		+	git status
		+	Show changes modified files introduce
		+	git diff
		+	Commit all modified files
		+	git commit -a
		+	Commit the new file foo.h
		+	git commit foo.h
		+	See also git add and git add -i
		+
		+	=== Synchronize changes to the local repository to your personal clone on gitorious ===
		+	git push
		+
		+	=== Synchronize changes to your personal clone on gitorious to the local repository ===
		+	Note: This step is only needed if you have more than one local repository
		+
		+	git pull
		+
		+	=== Synchronize changes to the marble/marble repository to your personal clone ===
		+	This is done by synchronizing changes to your local repository (see below) and pushing them to your personal clone afterwards (see above).
		+
		+	=== Synchronize changes to the marble/marble repository to your local repository ===
		+	git fetch mainline
		+	git merge mainline/svn.kde.org
		+
		+	You may also rebase the changes (see git tutorials).

@@ Line 31: / Line 31: @@
 While the number of repositories involved may seem huge and the process very complex, it is easy and fast to work with in practice. The main advantage of git in the GSOC context is its ability to handle merges easily. Merges occur when you synchronize your personal clone with the Marble development sources and when your GSOC project is merged ino the Marble development sources at the end of GSOC.
-== Gitorious Setup ==
+== Initial Setup ==
 Your personal clone of the marble/marble repository contains a full copy of the marble/marble repository at the time of cloning. You are the only one modifying this repository and it will contain your GSOC project. Setting up your personal clone of the marble/marble repository in gitorious is quite easy:
 * Create an account at [http://gitorious.org Gitorious]
@@ Line 38: / Line 40: @@
 * Click on "Clone repository" and again "Clone repository" on the next page after reviewing the settings
-== Local Repository Setup ==
+=== Local Repository Setup ===
 The local repository is a clone (full copy) of your personal clone on gitorious. You use it during development: Review changes and commit them to your local repository. Whenever you feel like it, synchronize it with your personal clone on gitorious: Upload the latest changes so that everyone else can see them.
@@ Line 45: / Line 47: @@
 Replace "earthwings" with your Gitorious account. The clone URL can differ; have a look at your personal clone on gitorious.org where the clone URL is listed.

← Older revision		Revision as of 08:03, 6 June 2010
Line 39:		Line 39:

	== Local Repository Setup ==		== Local Repository Setup ==
		+	The local repository is a clone (full copy) of your personal clone on gitorious. You use it during development: Review changes and commit them to your local repository. Whenever you feel like it, synchronize it with your personal clone on gitorious: Upload the latest changes so that everyone else can see them.
		+
		+	Initially you need to clone your personal gitorious clone to create the local repository. This goes as follows:
		+	git clone git@gitorious.org:~earthwings/marble/earthwings-marble.git
		+
		+	Replace "earthwings" with your Gitorious account. The clone URL can differ; have a look at your personal clone on gitorious.org where the clone URL is listed.