On this page; specific information about projects hosted using the bazaar distributed version control system described in the Applications section above.
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;
And then the process repeats.
So you want to survey, draw and store with Therion and Bazaar?
What you need.
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.
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/
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