diff --git a/handbook/computing/basiclaptop.html b/handbook/computing/basiclaptop.html index b4286c33b..91dc43ac1 100644 --- a/handbook/computing/basiclaptop.html +++ b/handbook/computing/basiclaptop.html @@ -43,7 +43,7 @@ And please write some documentation for the next person in your situation

Configuration

Follow this link to register a key with the expo server to get upload (i.e. read/write) access. -Do this first, Without it none of git, mercurial, scp, ftp or rsync will work. +Do this first, Without it none of git, scp, ftp or rsync will work.

On a Windows machine you will need to configure pageant (the putty authentication agent) to run at startup to load your key. diff --git a/handbook/computing/hbmanual2.html b/handbook/computing/hbmanual2.html index b997cb25b..75cdd98ed 100644 --- a/handbook/computing/hbmanual2.html +++ b/handbook/computing/hbmanual2.html @@ -58,7 +58,7 @@ not stored in the version control repositories so you cannot edit or change them

3. Your own laptop

Setting up your own laptop so that it can do everything the expo laptop can do is quite a -complicated process. At a minimum you will be an experienced software nerd already and will have git, mercurial and a text editor installed and you will know how to use them. +complicated process. At a minimum you will be an experienced software nerd already and will have git and a text editor installed and you will know how to use them. You will have done the ssh key-pair setup process - which you can only do entirely on your own if you have access to the expo laptop. @@ -71,7 +71,6 @@ you have access to the expo laptop.

@@ -80,13 +79,7 @@ but changes to dynamically-generated files - cave descriptions, QM lists etc. - will not take effect, until the troggle import/update scripts are run on the server. These should run automatically and frequently but currently they are run manually by nerds as the expo server is undergoing heavy software maintenance.

-

Mercurial Website Hack 2019

-

Currently [April 2020] after commiting and pushing your changes to the :expoweb: or :loser: respositories, you will need to -login to expo.survex.com using ssh, cd to ~/expoweb/ (or ~/loser/) and issue a "hg update" command to make your changes noticed by the webserver. This problem will go away during 2020 when Wookey finishes migrating these repos from mercurial to git. - - -

Back to to "Edit this page"
Forwards to Data Management Manual diff --git a/handbook/computing/manual.html b/handbook/computing/manual.html index 862c90551..cb4486077 100644 --- a/handbook/computing/manual.html +++ b/handbook/computing/manual.html @@ -51,7 +51,7 @@ processes that a maintainer would want to do.

Troggle runs the expo cave survey data management, presents the data on the website and manages the Expo Handbook. See the troggle intro.

Version control system

-

We use a distributed revision control system (git, and formerly mercurial) for all the important data. (Note that we just use git: not GitHub, not GitLab, just git.) +

We use a distributed revision control system (git) for all the important data. (Note that we just use git: not GitHub, not GitLab, just git.) This means that many people can edit and merge their changes with the expo server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut and those who have returned to the UK. Also anyone who is up @@ -65,8 +65,6 @@ then get synchronised when it next gets internet access. do not get modified, so they are kept as a plain directory of files 'expofiles'. The same goes for holiday photographs and GPS logs.

-

In 2019 we had half our version-controlled repositories under mercurial and half under git. -The intention is to move entirely to git before the 2020 expo.

Contents

    @@ -115,10 +113,9 @@ editing and keeps track of all changes so we can roll back and have branches if -

    We have migrated two of these to git but the other two still use mercurial.

    Updating cave pages

    diff --git a/handbook/computing/todo.html b/handbook/computing/todo.html index 58953f4e3..6c1e019c3 100644 --- a/handbook/computing/todo.html +++ b/handbook/computing/todo.html @@ -67,9 +67,6 @@ If a heading is in italics, then there are hidden items.
    Diagrams of major sections: survey handbook, rigging handbook, computing handbook, Areas, cave data..
    Chase Airoa to help fix the menus for phones
    Look at gov.uk guidelines for inspiration
    -
    When git migration done -
    Edit out all mercurial -
    NOEDIT flag
    When editing multiple pages (using git), describe how this is implemented using <meta name="keywords" content="NOEDIT">
    Editing Logbooks diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index d02395288..6547da858 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -51,7 +51,6 @@ but all the recommended software here is open source (and please don't install p

    The list of software: