GitSuperRepoAdminGuide - Revision history

Hinder: /* Creating a new super-repo branch */

2013-11-27T11:05:58Z

‎Creating a new super-repo branch

2013-11-27T10:53:35Z

‎Common tasks

2013-11-27T10:33:48Z

‎Adding git-svn repository mirrors

2012-10-24T09:07:01Z

‎EInstein Toolkit mirrors

2012-10-24T09:06:38Z

‎Permissions

2011-10-28T10:07:59Z

‎Adding git mirrors

2011-10-28T10:07:25Z

‎Hosting mirrors on a server

2011-09-21T17:53:44Z

‎Adding a submodule

2011-09-21T17:48:09Z

‎Moving to a new upstream url

2011-09-21T17:46:33Z

‎Hosting mirrors on a server

@@ Line 357: / Line 357: @@
 * (edit .gitmodules)
 * git module sync
 * git module commit

←Older revision		Revision as of 10:53, 27 November 2013
Line 350:		Line 350:

	</pre>		</pre>
		+
		+	===Creating a new super-repo branch===
		+
		+	* git clone git://git.barrywardell.net/EinsteinToolkit
		+	* git checkout -b ET_2013_11
		+	* (edit .gitmodules)
		+	* git module sync
		+	* git module commit

@@ Line 38: / Line 38: @@
 Add a fetching repository on the server:
    ssh server
-   cd fetch
+   add-git-svn-mirror arrangements/${arr}/${thorn} http://svn.cactuscode.org/arrangements/${arr}/${thorn}
 == Adding git mirrors ==

@@ Line 77: / Line 77: @@
 == Permissions ==
-== EInstein Toolkit mirrors ==
+== Einstein Toolkit mirrors ==
 The Einstein Toolkit mirrors are currently hosted on git.barrywardell.net.  When a thorn gets added to the Einstein Toolkit, we have to do the following steps to handle it:

←Older revision		Revision as of 09:06, 24 October 2012
Line 76:		Line 76:

	== Permissions ==		== Permissions ==
		+
		+	== EInstein Toolkit mirrors ==
		+
		+	The Einstein Toolkit mirrors are currently hosted on git.barrywardell.net. When a thorn gets added to the Einstein Toolkit, we have to do the following steps to handle it:
		+
		+	1. Add the thorn to the conf/gitolite.conf file in the gitolite-admin directory. Commit and push.
		+
		+	2. Run add-git-svn-mirror to add a mirror of the svn repository, e.g.
		+	$ add-git-svn-mirror arrangements/arr/thorn https://svn.cactuscode.org/arrangements/arr/thorn
		+
		+	3. Add the new thorn to the Einstein Toolkit super-repository: Edit .gitmodules, run 'git module sync', commit and push.
		+
		+	4. Initialise the new submodule in the fetching repository on the server:
		+	$ ssh et@barrywardell.net
		+	$ cd fetch/EinsteinToolkit
		+	$ git pull
		+	$ git submodule update --init

	== Common Tasks ==		== Common Tasks ==

@@ Line 52: / Line 52: @@
 == Adding git mirrors ==
-vi conf/gitolite.conf
+  vi conf/gitolite.conf
-git commit conf/gitolite.conf
+  git commit conf/gitolite.conf
-git push
+  git push
-ssh fp@server
+  ssh fp@server
-cd fetch
+  cd fetch
-vi git.list # add <newrepo>
+  vi git.list # add <newrepo>
-git clone --mirror <url> <newrepo>
+  git clone --mirror <url> <newrepo>
-cd <newrepo>
+  cd <newrepo>
-git remote add bare cactus@localhost:<newrepo>
+  git remote add bare cactus@localhost:<newrepo>
-git config --unset remote.bare.fetch
+  git config --unset remote.bare.fetch
-git push bare --all
+  git push bare --all
 == Removing repository mirrors ==

←Older revision		Revision as of 10:07, 28 October 2011
Line 51:		Line 51:
	git pull bare		git pull bare

		+	== Adding git mirrors ==
		+	vi conf/gitolite.conf
		+	git commit conf/gitolite.conf
		+	git push
		+
		+	ssh fp@server
		+	cd fetch
		+	vi git.list # add <newrepo>
		+	git clone --mirror <url> <newrepo>
		+	cd <newrepo>
		+	git remote add bare cactus@localhost:<newrepo>
		+	git config --unset remote.bare.fetch
		+	git push bare --all

	== Removing repository mirrors ==		== Removing repository mirrors ==

@@ Line 102: / Line 102: @@
 Adding a new submodule is as simple as running:
-   git module add <url-to-repository> <path-to-submodule> [<upstream-url>] [<upstream-type>] [<track-branch>]
+   git module add <url-to-repository> <path-to-submodule> <upstream-url> <upstream-type> <track-branch>
-checking the changes look OK, committing and then pushing. The optional arguments <upstream-url>, <upstream-type> and <upstream-branch> specify the URL and type of the upstream version of this repository and the branch which the super-repository should track. If not given, <upstream-url> is assumed to be the same as <url-to-repository> and <upstream-type> is assumed to be 'git'. Other possible options for <upstream-type> are 'hg' and 'svn'. If <track-branch> is not given it defaults to 'trunk' for git-svn repositories and 'master' for git and hg-git repositories.
+checking the changes look OK, committing and then pushing. The arguments <upstream-url>, <upstream-type> and <upstream-branch> specify the URL and type of the upstream version of this repository and the branch which the super-repository should track.
 === Removing a submodule ===

@@ Line 68: / Line 68: @@
 Update the location on the gitolite server:
-mv <old> <new>
+  mv <old> <new>
-Edit gitolite permissions, commit and push
+  Edit gitolite permissions, commit and push
 Update the fetching repository:
-Edit gitsvn.list - change path and URL
+  Edit gitsvn.list - change path and URL
-mv <old> <new>
+  mv <old> <new>
-Edit .git/config - change svn-remote url and bare url
+  Edit .git/config - change svn-remote url and bare url
-Run git svn fetch - This needs to fetch at least one new revision from svn!
+  Run git svn fetch - This needs to fetch at least one new revision from svn!
-Change svn-remote url back to the original url
+  Change svn-remote url back to the original url
-Run git svn rebase -l to do a local rebase (with the changes that came in with the last fetch operation)
+  Run git svn rebase -l to do a local rebase (with the changes that came in with the last fetch operation)
-Change svn-remote url back to the new url
+  Change svn-remote url back to the new url
-Run git svn rebase should now work again!
+  Run git svn rebase should now work again!
 == Optional Extras ==

@@ Line 50: / Line 50: @@
    cd ~/fetch/<newrepo>
    git pull bare
 == Permissions ==