From db08c4d5d342a1ccbf9ed5bc60ef5be6b38853db Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 5 Mar 2022 13:36:38 +0000 Subject: [PATCH] Troggle online: Edit this page - repos.html --- handbook/computing/repos.html | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/handbook/computing/repos.html b/handbook/computing/repos.html index 13cc40bc8..52c50805b 100644 --- a/handbook/computing/repos.html +++ b/handbook/computing/repos.html @@ -37,14 +37,6 @@ expo.survex.com: -

Uploading cave survey data

- -

You can read or clone these repos without any control, but to write ("push") to them you will need to use ssh://expo@expo.survex.com and set up the key exchange. -

NOTE: when using git to path to a repository, always use user 'expo' as the login user (ssh://expo@...) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this. - -

So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then -see the basic laptop setup. -

Version control system

We use a distributed revision control system (git) 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 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 /expofiles/.

+ +

Uploading cave survey data, scanned notes or Therion/Tunnel drawings

+

You do not 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. + +

Reading and cloning

+ +

You can read or clone these repos without any control, but to write ("push") to them you will need to use ssh://expo@expo.survex.com and set up the key exchange. +

NOTE: when using git to path to a repository, always use user 'expo' as the login user (ssh://expo@...) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this. + +

So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then +see the basic laptop setup. + +

Return to Expo Data Maintenance manual
-Return to Expo Systems Overview - +Return to Expo Systems Overview