expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

grey banner and lots of to-do fixes, to do items all updated from scribbled notes on printout

Browse Source
This commit is contained in:
Philip Sargent
2020-04-22 19:37:10 +01:00
parent dcd2711ddb
commit 25f9430fac
31 changed files with 1828 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
handbook/computing/manual.html
View File

@@ -53,10 +53,10 @@ processes that a maintainer would want to do.</p>
<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>, and formerly mercurial) for all the important data. (Note that we just use git: not GitHub, not GitLab, just <a href="https://git-scm.com/about/distributed">git</a>.)
This means that many people can edit and merge their changes with the expo
server in Cambridge at the same time: including people still on expo in the Tatty Hut
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
to date can take their laptop somewhere and enter data even if they have no internet access,
and the updates can be merged when they get back to civilization.
and the updates will be merged when they get back to civilization.
</p>
<p>In principle, survey notes can be typed into a laptop up on the plateau which would
then get synchronised when it next gets internet access.
@@ -65,9 +65,8 @@ 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.</p>
<p>From 2012-2019 we used mercurial (aka 'hg'), but completed the move to git
before the 2020 expo.</p>
<p>In 2019 we had half our <a href="manual.html#repositories">version-controlled repositories</a> under mercurial and half under git.
The intention is to move entirely to git before the 2020 expo.
<h3>Contents </h3>
<ol>
@@ -84,6 +83,7 @@ Appendices:
<ul>
<li><a href="../website-history.html">Website history</a> - a history of the data management system up to 2019</li>
<li><a href="../c21bs.html">Taking Expo Bullshit into the 21st Century</a> - initial report from 1996</li>
<li><a href="useany.html">Platform portability</a> - making the website work widely [2006]</li>
</ul>
<h3><a id="usernamepassword">Getting a username, password and key</a></h3>
@@ -113,12 +113,12 @@ editing and keeps track of all changes so we can roll back and have branches if
<p>The site has been split into four parts:</p>
<ul>
<li><a href="/hgrepositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
<li><a href="/repositories/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
<li><a href="/repositories/expoweb/.git/log">expoweb</a> - the website pages, handbook, generation scripts (git)</li>
<li><a href="/repositories/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
<li><a href="/repositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
<li><a href="/cgit/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
<li><a href="/repositories/home/expo/expoweb/graph">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
<li><a href="/cgit/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
</ul>
<p>We have migrated three of these to git but loser is still mercurial for a few more days.
<p>We have migrated two of these to git but the other two still use mercurial.
<h3><a id="cavepages">Updating cave pages</a></h3>