mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-03-20 09:11:56 +00:00
corrrect git commands. tested on a fresh laptop.
This commit is contained in:
parent
2282b06dc4
commit
95b7afada2
@ -15,33 +15,31 @@
|
||||
<p>Since 2019 all use of version control software requires that you
|
||||
have <a href="keyexchange.html">key-pair setup</a> already set up before any of this will work on your own machine.
|
||||
|
||||
<p><font style="font-size: big; color:red"><b>NOT CHECKED _ TO BE EDITED BY A git NERD TO MAKE IT WORK. DO NOT DO THIS UNTIL THAT HAS BEEN DONE</b>
|
||||
<p>
|
||||
- check that you can get ssh working before trying to run git too</font>
|
||||
|
||||
<p>If you can get to the <i>expo laptop</i> try these commands on that first as the key exchange has already been done.
|
||||
<p>If you can get to the <i>expo laptop</i> try these commands on that first as the key exchange has already been done. If the key exchnage has not been done then none of this will work.
|
||||
|
||||
<p> Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.
|
||||
<dl>
|
||||
<dt>expoweb (The data management system)</dt>
|
||||
<dt>expoweb (The data management system) - this will fail until it is moved from hg to git</dt>
|
||||
<dd>
|
||||
<tt>git clone ssh://expo@expo.survex.com/expoweb</tt> (read/write)<br />
|
||||
<tt>git clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only checkout)
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</tt> (read/write)<br />
|
||||
</dd>
|
||||
|
||||
<dt>troggle (The data management system backend)</dt>
|
||||
<dd>
|
||||
<tt>git clone ssh://expo@expo.survex.com/troggle</tt> (read/write)<br />
|
||||
<tt>git clone http://expo.survex.com/repositories/home/expo/troggle/</tt> (read-only checkout)
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/troggle</tt> (read/write)<br />
|
||||
</dd>
|
||||
|
||||
<dt>loser (The survey data)</dt>
|
||||
<dt>loser (The survey data) - this will fail until it is moved from hg to git</dt>
|
||||
<dd>
|
||||
<tt>git clone ssh://expo@expo.survex.com/loser</tt> (read/write)<br />
|
||||
<tt>git clone http://expo.survex.com/repositories/home/expo/loser/</tt> (read-only)
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/loser</tt> (read/write)<br />
|
||||
</dd>
|
||||
|
||||
<dt>drawings</dt>
|
||||
<dt>drawings </dt>
|
||||
<dd>
|
||||
<tt>git clone ssh://expo@expo.survex.com/drawings</tt> (read/write)<br />
|
||||
<tt>git clone http://expo.survex.com/repositories/home/expo/drawings/</tt> (read-only)
|
||||
<tt>git clone ssh://expo@expo.survex.com:/home/expo/drawings</tt> (read/write)<br />
|
||||
</dd>
|
||||
</dl>
|
||||
<h3><a id="gitwindows">Using git in Windows</a></h3>
|
||||
@ -49,7 +47,7 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
|
||||
<p>Once you've downloaded and installed a git client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:</p>
|
||||
|
||||
<p><tt>git clone ssh://expo@expo.survex.com/expoweb</tt></p>
|
||||
<p><tt>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</tt></p>
|
||||
|
||||
<p>for subsequent updates</p>
|
||||
|
||||
@ -57,13 +55,11 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
|
||||
<p>will generally do the trick.</p>
|
||||
|
||||
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
|
||||
|
||||
<p>After you've made a change, commit it to you local copy with:</p>
|
||||
|
||||
<p><tt>git commit</tt> (you can specify filenames to be specific)</p>
|
||||
|
||||
<p>The first time you do this on a Windows machineit will probably not work as it does not recognise the server.
|
||||
<p>The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage.
|
||||
Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server.
|
||||
If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.</p>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user