Earthwings (Talk | contribs) |
Earthwings (Talk | contribs) (→Day-to-Day operations) |
||
| 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). | ||
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.
The Marble source code is stored in the official KDE Subversion repository. The directory trunk/KDE/kdeedu/marble/ keeps the latest development changes. This is the reference code you should work with during GSOC. For your convenience this repository part is mirrored at gitorious.org in the svn.kde.org branch of the marble repository in the marble project. This branch is updated from time to time to keep in sync with the development in Subversion.
For your GSOC project, you setup another git repository on gitorious.org: Your personal clone of the marble gitorious repository. You will be the only person writing to the repository. Additionally you can synchronize it with (import) the latest Subversion changes at your convenience. There's a fourth repository, your local clone of your personal gitorious clone. Local means that unlike the other repositories, this one is only stored on your system. This is the repository you work with most of the time. The others are only for synchronization.
Summing it up, there are four physical repositories:
Logically, there are only two repositories:
To understand how these repositories are updated / synchronized, let's have a look at who does which changes. First, changes from the top:
Changes from bottom to top happen like this:
Now how does your GSOC project end in the official Subversion repository? This will be handled at the end of GSOC via reviewboard. Git can create the necessary patch easily.
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.
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:
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.
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.
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
git push
Note: This step is only needed if you have more than one local repository
git pull
This is done by synchronizing changes to your local repository (see below) and pushing them to your personal clone afterwards (see above).
git fetch mainline git merge mainline/svn.kde.org
You may also rebase the changes (see git tutorials).
KDE TechBase 