Changes between Version 4 and Version 5 of Doc/SCDB/Git

Timestamp:

Feb 24, 2010, 4:08:41 PM (16 years ago)

Author:

/O=GRID-FR/C=FR/O=CNRS/OU=LAL/CN=Michel Jouvin

Comment:

--

Doc/SCDB/Git

@@ -59 +59 @@
 If you use `svn:externals` in your configuration database to refer to some common parts or some of the deployment tools, this requires additional steps. [http://git-scm.com Git], as other DVCS, has no support for external references. But, through the ''submodule'' feature, it is possible to somewhat emulate the SVN feature.
 
-The solution is a bit tricky  but is well described at http://kerneltrap.org/mailarchive/git/2007/5/1/245002. The idea is to fetch each external as a separate branch in the Git repository and create submodules, one for each external, by cloning the repository itself, hacking a few files so that they refer to the same as in the main repository and change the branch used for each submodule to the appropriate one.
- 
+The solution is a bit tricky  but is well described at http://kerneltrap.org/mailarchive/git/2007/5/1/245002. The idea is to fetch each external as a separate branch in the Git repository and create submodules, one for each external, by cloning the repository itself, hacking a few files so that they refer to the same as in the main repository and change the branch used for each submodule to the appropriate one. Typical steps involve:
+ * Adding the SVN remote branches to be tracked for each tool. This is typically done by adding the following sections to `.git/config` (change the versions to whatever is appropriate):
+{{{
+[svn-remote "panc-8.2.11"]
+        url = https://svn.lal.in2p3.fr/LCG/QWG
+        fetch = /External/panc-8.2.11:refs/remotes/svn-panc-8.2.11
+[svn-remote "ant-1.7.1"]
+        url = https://svn.lal.in2p3.fr/LCG/QWG
+        fetch = /External/apache-ant-1.7.1:refs/remotes/svn-ant-1.7.1
+[svn-remote "saxonb-9.1.0.2J"]
+        url = https://svn.lal.in2p3.fr/LCG/QWG
+        fetch = /External/saxonb-9.1.0.2J:refs/remotes/svn-saxonb-9.1.
+[svn-remote "scdb-ant-utils-8.0.1"]
+        url = https://svn.lal.in2p3.fr/LCG/QWG
+        fetch = /External/scdb-ant-utils-8.0.1:refs/remotes/svn-scdb-ant-utils-8.0.1
+[svn-remote "svnkit-1.3.2"]
+        url = https://svn.lal.in2p3.fr/LCG/QWG
+        fetch = /External/svnkit-1.3.2:refs/remotes/svn-svnkit-1.3.2
+}}}
+ * Fetch each remote branch with the following command used for each `svn-remove` entry. Based on previous configuration, the commands will be
+{{{
+git svn fetch ant-1.7.1
+git svn fetch panc-8.2.11
+git svn fetch saxonb-9.1.0.2J
+git svn fetch scdb-ant-utils-8.0.1
+git svn fetch svnkit-1.3.2
+}}}
+ * Create a branch for tracking each of the remote branch:
+{{{
+git branch ant-1.7.1 svn-ant-1.7.1
+git branch panc-8.2.11 svn-panc-8.2.11
+git branch saxonb-9.1.0.2J svn-saxonb-9.1.0.2J
+git branch scdb-ant-utils-8.0.1 svn-scdb-ant-utils-8.0.1
+git branch svnkit-1.3.2 svn-svnkit-1.3.2
+}}}
+ * Create each `external/` directory and clone the repository into them (without checking it out). Following commands must be updated based on your actual configuration:
+{{{
+mkdir external
+for rep in ant panc saxon svnkit scdb-ant-utils; do git clone -n -s . external/$rep; done
+}}}
+ * Go into each directory and do the following using the appropriate branch created previously:
+{{{
+rm -rf .git/refs .git/logs .git/info .git/description .git/config
+ln -s ../../.git/refs .git/refs
+ln -s ../../.git/logs .git/logs
+ln -s ../../.git/info .git/info
+ln -s ../../.git/config .git/config
+ln -s ../../.git/description .git/description
+#Use the appropriate branch name for each subdirectory
+git checkout ant-1.7.1
+}}}
+
 == Using Git for Everyday Operations == #GitEveryDay