Getting Started/Sources/Amarok Git Tutorial - Revision history

Neundorf at 20:18, 28 April 2011

2011-04-28T20:18:16Z

Odysseus at 14:04, 1 March 2011

2011-03-01T14:04:06Z

Valoriez: /* Follow and test the latest development code */ updated URL to anongit

2011-02-02T22:01:54Z

‎Follow and test the latest development code: updated URL to anongit

Jriddell: typo

2010-10-14T14:14:37Z

typo

Jriddell: update git URLs

2010-10-14T14:00:32Z

update git URLs

Mamarok: /* Patch Contributions */ fixed typo

2010-06-25T15:37:28Z

‎Patch Contributions: fixed typo

Jefferai at 17:19, 24 June 2010

2010-06-24T17:19:49Z

Jefferai at 18:13, 22 June 2010

2010-06-22T18:13:03Z

Jefferai at 16:33, 22 June 2010

2010-06-22T16:33:56Z

Jefferai at 16:09, 22 June 2010

2010-06-22T16:09:56Z

@@ Line 183: / Line 183: @@
 *creating feature branches
 *history manipulation. rebase -i, commit --append, and what to do when things go wrong. Probably its own page.
-*merging with [[Development/Tutorials/Git]]

← Older revision		Revision as of 14:04, 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. }}
		+
	Amarok is now developed in a Git repository instead of SVN. This was done to help get into place all the needed infrastructure to convert all of KDE, including documentation. <br>		Amarok is now developed in a Git repository instead of SVN. This was done to help get into place all the needed infrastructure to convert all of KDE, including documentation. <br>

@@ Line 16: / Line 16: @@
 == Follow and test the latest development code  ==
-  git clone git://git.kde.org/amarok
+  git clone git://anongit.kde.org/amarok
 This creates an 'amarok' directory. cd into that and use it like normal. And when you want to update:

@@ Line 30: / Line 30: @@
 If you want to use a local clone for working on bug fixes or features, do the following:
-*Create a branch for each new feature of bug fix you want to work on:
+*Create a branch for each new feature or bug fix you want to work on:
   git branch my_feature_branch

@@ Line 16: / Line 16: @@
 == Follow and test the latest development code  ==
-  git clone git://git.kde.org/amarok/amarok
+  git clone git://git.kde.org/amarok
 This creates an 'amarok' directory. cd into that and use it like normal. And when you want to update:
@@ Line 48: / Line 48: @@
 *You can follow the main development branch easily by adding it as remote branch:
-  git remote add upstream git://git.kde.org/amarok/amarok
+  git remote add upstream git://git.kde.org/amarok
 *Update by pulling from the remote:
@@ Line 66: / Line 66: @@
 Once you have a KDE development SSH account, a basic local clone for development work that allows push access can be created by running:
-  git clone git@git.kde.org:amarok/amarok
+  git clone git@git.kde.org:amarok
 This will place a clone in the "amarok" subdirectory of the current folder.
@@ Line 81: / Line 81: @@
 To create a personal clone, run the following command, substituting your KDE username and a reponame of your choice, *without* a trailing ".git":
-  ssh git@git.kde.org clone amarok/amarok amarok/users/[username]/[reponame]
+  ssh git@git.kde.org clone amarok clones/amarok.git/[username]/[reponame]
-After that, you will have a fully functioning repository of your own at git://git.kde.org/amarok/users/[username]/[reponame] or git@git.kde.org:amarok/users/[username]/[reponame] for read-only and push URLs, respectively.
+After that, you will have a fully functioning repository of your own at git://git.kde.org/clones/amarok.git/[username]/[reponame] or git@git.kde.org:clones/amarok.git/[username]/[reponame] for read-only and push URLs, respectively.
 You can delete this repository at any time by running the "destroy" command:
-  ssh git@git.kde.org destroy amarok/users/[username]/[reponame]
+  ssh git@git.kde.org destroy clones/amarok.git/[username]/[reponame]
 ==== Rights Management ====
@@ Line 99: / Line 99: @@
 To see the current permissions, use the "getperms" command:
-  ssh git@git.kde.org getperms amarok/users/mitchell/testrepo
+  ssh git@git.kde.org getperms clones/amarok.git/mitchell/testrepo
   RW = @all
@@ Line 113: / Line 113: @@
 Now, use the "setperms" command to set the permissions, passing in the file you created:
-  ssh git@git.kde.org setperms amarok/users/mitchell/testrepo < myperms
+  ssh git@git.kde.org setperms clones/amarok.git/mitchell/testrepo < myperms
   New perms are:
   RW = hein bcooksley
@@ Line 145: / Line 145: @@
 Remember that you can't push to git:// URL's when picking what URL to use.
-  git remote add jeff git://git.kde.org/amarok/users/mitchell/pudaction.git
+  git remote add jeff git://git.kde.org/clones/amarok.git/mitchell/pudaction.git
   git remote update
   git branch -a

@@ Line 64: / Line 64: @@
 === Setup Amarok Clone  ===
-A basic local clone for development work that allows push access can be created by running:
+Once you have a KDE development SSH account, a basic local clone for development work that allows push access can be created by running:
   git clone git@git.kde.org:amarok/amarok
@@ Line 70: / Line 70: @@
 This will place a clone in the "amarok" subdirectory of the current folder.
-Once you have a KDE development SSH account, you can create your own server-side clone of the Amarok repository and store your changes there. Others can then pull from your repository or add your repository as a remote.
+If for some reason port 22 will not work for you (such as if you behind a firewall allowing only ports 80 and 443 through) you can use port 443 on git.kde.org by specifying the port in ~/.ssh/config:
 Please note that personal clones are using KDE infrastructure and meant for KDE-relevant work, and as such you cannot change the access policy that allows everyone to read these clones (but you can change who can write to them, as explained below). Please do not create clones to e.g. make changes to customize code for your company. If you want to do this, host your clone on Gitorious.org or GitHub.com instead.

@@ Line 28: / Line 28: @@
 This is still a work in progress, as we work on getting ReviewBoard set up. In the meantime, hold on to any patches, or email them to amarok-devel@kde.org -- just be sure to follow the thread to ensure that it doesn't get lost  :-)
-If you have a KDE development SSH account, you can create your own server-side clone of the Amarok repository and store your changes there. Others could then pull from your repository or add your repository as a remote.
+If you want to use a local clone for working on bug fixes or features, do the following:
-−
-To do this, run the following command, substituting your KDE username and a reponame of your choice, *without* a trailing ".git":
-−
-ssh git@git.kde.org clone amarok/amarok amarok/users/[username]/[reponame]
-−
-After that, you will have a fully functioning repository of your own at git://git.kde.org/amarok/users/[username]/[reponame] or git@git.kde.org:amarok/users/[username]/[reponame] for read-only and push URLs, respectively.
-−
-You can delete this repository at any time by running the "rmrepo" command:
-−
-ssh git@git.kde.org rmrepo amarok/users/[username]/[reponame]
 *Create a branch for each new feature of bug fix you want to work on:
@@ Line 55: / Line 45: @@
   git commit -a
 *You can follow the main development branch easily by adding it as remote branch:
@@ Line 72: / Line 58: @@
 == Amarok Developers  ==
-=== account setup ===
+=== Account Setup ===
 If you don't already have a SSH account to the KDE SVN, please file a sysadmin bug on http://bugs.kde.org and provide your logon and your SSH pub key.
@@ Line 78: / Line 64: @@
 === Setup Amarok Clone  ===
-The easiest thing to do is just use that:
+A basic local clone for development work that allows push access can be created by running:
- git clone git@gitorious.org:amarok/amarok.git
+git clone git@git.kde.org:amarok/amarok
-This will create a directory 'amarok'. cd into that and start developing!
+This will place a clone in the "amarok" subdirectory of the current folder.
-If you already have an existing checkout form Gitorious times, simply edit the .git/config file and change "gitorious.org" to "git.kde.org" for the main repository (not any personal clones you may have in remotes).
+Once you have a KDE development SSH account, you can create your own server-side clone of the Amarok repository and store your changes there. Others could then pull from your repository or add your repository as a remote.
 === Basic Development  ===
@@ Line 113: / Line 109: @@
 Remember that you can't push to git:// URL's when picking what URL to use.
-  git remote add jeff git://gitorious.org/~jefferai/amarok/jefferai-work.git
+  git remote add jeff git://git.kde.org/amarok/users/mitchell/pudaction.git
   git remote update
   git branch -a
-  git branch jeff-pud pud-action/pudaction-removal
+  git branch jeff-pud jeff/pudaction-removal
   git checkout jeff-pud
   #and later you want to switch back to the mainline
@@ Line 131: / Line 127: @@
 ''git checkout'' is how you switch between branches.
-= Recommended reading  =
+ Recommended reading  =
 *[http://tom.preston-werner.com/2009/05/19/the-git-parable.html The Git Parable] ''Background information that will help you understand git and distributed revision control systems in general''