5.1.Bazaar Repositories

On this page; specific information about projects hosted using the bazaar distributed version control system described in the Applications section above.

List of Projects managed with Bazaar

This information is stored in a secure location available only to current NZSS members, and is subject to the NZSS code of ethics.  In most circumstances is not to be released to non-members.  To access these repositories, you will need to install Bazaar and contact Bruce Mutton regarding access.

Click here to see Bazaar Repositories - Cave Projects (secure)

Most users will;

  • pull (download) repo's (repositories) from the above locations,
  • make their own edits, then
  • send these as a patch to the repository owner,
  • who will merge the changes and push (upload) them to the repo.

And then the process repeats.

Getting Started 

So you want to survey, draw and store with Therion and Bazaar? 

What you need. 

  1. (Optional, but highly recommended), your favourite text editor, eg NotePad++ that can be taught to speak Therion https://therion.speleo.sk/wiki/contrib:externaleditors#notepad  
  2. Install Bazaar version control software (make sure you tick to include Tortoise Bazaar) and configure it with your name, email address and favourite text editor (as above). Reboot to activate Tortoise Bazaar icon overlays in Explorer. 
  3. The password to allow bazaar to access the server. There is a generic 'reader' password that we release on request, and later you can get your own username and password, or even a public-private security key that largely avoids the need for passwords. 
  4. Install Therion digital cave software. 

How to Use it 

  1. Create or go to your folder to hold your survey projects, say C:/... /CaveSurveyingProjects 
  2. Create a folder for the project you want to download, say the project is called th_MyCave C:/... /CaveSurveyingProjects/th_MyCave
    Hint: Copy the project name from the last part of the repository path from the list above. 
  3. Goto the th_MyCave folder, initialise a repository, pull (download) the project trunk. See Bazaar Concepts Cave Survey - Orientation 

ie from source bzr+ssh://reader@server.jake.nz/th_MyCave/trunk/
to local C:/... /CaveSurveyingProjects/th_MyCave/trunk/

Hint: Adding the development branch you want to access (ie trunk/) at the end is important
If you don't intend to make changes to submit for approval, you can stop here and play with the data as you wish. 


However if you want to edit the files and merge your changes with the central master trunk, you will need to create your own feature branch, make your edits then use bazaar to create a patch (it uses your untouched trunk as a benchmark) to send to the project owner for approval and merging with the central master trunk.
Once they have updated the central master trunk, you can pull the new trunk contents into your local repository (Bazaar only moves the changes, not the whole repository, so this is much quicker than your initial download). 


So, assuming you want to make your own contribution to the project...  

4. Create a feature branch from your new trunk, using the branch command. See Bazaar Concepts Cave Survey - Workflow 

5. Now you are free to edit your files in your feature branch. make changes, compile maps, test these changes.
See Bazaar Concepts Cave Survey - Workflow 
You can use bazaar to recognise changes (Diff) that have been made, and undo these changes selectively (Revert) 

6. From time to time, take snapshots (Commit) to store your changes in the repository. Do this regularly.  Write detailed commit messages as you work. 

7. Keep making edits and committing snapshots until you are at some milestone that you would like to merge with the central master trunk. Use bazaar to create a patch to send to the project owner. 

Start your own project

If you want a folder and file template from which to start your own cave survey project , then you can pull one from bzr+ssh://reader@server.jake.nz/th_TherionProjectBazaarTemplate/trunk/

Want to avoid all that password use? 

If you want to avoid typing or pasting passwords each time you interact with an online versioned repository, then you might like to use a 'public-private key', which allows secure interaction with the versioned repositories, and you only have to enter a password (if you want) at the start of each working day. General instructions are here, on the bazaar website. http://wiki.bazaar.canonical.com/Bzr_and_SSH and scrolling down to "Windows" and "Using PuTTYgen and Pageant" is how I've done it.
... Yes, it looks a bit complicated. I'm working on some guidance for this ... 

Go to the PuTTY download page http://www.chiark.greenend.org.uk/~sgtatham/putty/ and download pageant.exe and puttygen.exe 

More information... http://www.putty.org/  and  http://en.wikipedia.org/wiki/PuTTY 

Yes No Suggest edit
Last updated on April 30, 2020
0 of 0 users found this section helpful
Help Guide Powered by Documentor
Suggest Edit