expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-28 18:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Troggle online: Edit this page - repos.html

Browse Source
This commit is contained in:
Philip Sargent 2022-03-05 13:36:38 +00:00
parent bc221b819a
commit db08c4d5d3
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
handbook/computing/repos.html
View File

@ -37,14 +37,6 @@ expo.survex.com:
<ul> <ul>
<li>Quick <a href="qstart-git.html">reminders for using git</a> at the command line. <li>Quick <a href="qstart-git.html">reminders for using git</a> at the command line.
</ul> </ul>
<h3>Uploading cave survey data</a></h3>
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>NOTE: when using git to path to a repository, always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this.
<p>So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The <i>expo laptop</i> lives in the potato hut during expo and it is sometimes joined by the laptop '<i>aziraphale</i>'. These are both loaned machines running Linux. If you want to use your own laptop then
see the <a href="basiclaptop.html">basic laptop setup</a>.
<h3 id="git">Version control system</a></h3> <h3 id="git">Version control system</a></h3>
<p>We use a distributed revision control system (<a href="https://git-scm.com/about/distributed">git</a>) for all the important data. <p>We use a distributed revision control system (<a href="https://git-scm.com/about/distributed">git</a>) for all the important data.
@ -61,9 +53,22 @@ We use git because it is now the industry standard. In the past we have used <a
<p>A version control system is inefficient for photos, GPS tracks and scanned survey notes which are large files that do not get modified. These are kept as a plain directory of files <a href="/expofiles"><var>/expofiles/</var></a>. <p>A version control system is inefficient for photos, GPS tracks and scanned survey notes which are large files that do not get modified. These are kept as a plain directory of files <a href="/expofiles"><var>/expofiles/</var></a>.
</p> </p>
<h3>Uploading cave survey data, scanned notes or Therion/Tunnel drawings</a></h3>
<p>You do <em>not</em> need to know about the version control system for several common
cave data surveying tasks. The online system has forms to allow you to upload these, and it invokes git behind the scenes to keep everything tidy. However these capabilities are being used for the first time on the 2022 expo so be prepared for things to break, e.g. if two people try to do the same thing at the same time.
<h3>Reading and cloning</a></h3>
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>NOTE: when using git to path to a repository, always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this.
<p>So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The <i>expo laptop</i> lives in the potato hut during expo and it is sometimes joined by the laptop '<i>aziraphale</i>'. These are both loaned machines running Linux. If you want to use your own laptop then
see the <a href="basiclaptop.html">basic laptop setup</a>.
<hr /> <hr />
Return to <a href="manual.html">Expo Data Maintenance manual</a><br> Return to <a href="manual.html">Expo Data Maintenance manual</a><br>
Return to <a href="onlinesystems.html">Expo Systems Overview</a> Return to <a href="onlinesystems.html">Expo Systems Overview</a></body>
</body>
</html> </html>