Thesaurus Tool CodePublic Space

Summary

This space includes a Subversion repository that has three subdirectories: branches, tags, and trunk.

To start development, check out the code from the relevant development branch (using Tortoise SVN client) and commit any changes back to the same branch. 

When changes are stable in a development branch it should be merged back into the trunk.

When we have a released version then we will create a tag for that release.  A new branch should be created for bug fixes on the trunk, this will be in parallel to a new development branch

-- Rachel Heaven 30 April 2008

Instructions for new developers

Install TortoiseSVN client

For windows go to

http://tortoisesvn.net/downloads

Links for TortoiseSVN downloads for Mac etc are on the Trac/SVN page of this site.

Once installed, TortoiseSVN has very good help pages which you should look at

Every call you make to the repository will prompt you for your userid and password - this will be the userid and password for your assembla registration. If you don't want to type it every time tick the box for authentication data to be saved.

Checkout code from repository

In very brief summary (read the help manual for full information), to use the code repository in Windows:

1. create an empty folder that will contain all code e.g. C:\Wamp\www\agrovocedits

2. right click on the folder, select SVN Checkout... from the menu

3. In the Checkout dialog

3.1 enter the URL of repository for the current development branch

https://svn2.assembla.com/svn/thesaurusToolCode/branches/branch2008_1.0

(Note than on the the Trac/SVN tab of this website it quotes the URL for the repository as using http but I need to use https to get it to connect from my PC. This could be because of our proxy server or because ours is set up to automatically recognise our windows credentials)

3.2 the checkout directory should be your current folder

3.3 select HEAD revision (i.e. the latest revision on this branch)

3.4 click OK. This will copy all code into your folder, it should appear at first with a green tick next to each file and folder - this indicates that it matches the contents of the branch

4. Modify code

4.1 updated files and folders with any updated content appear with a red exclamation mark

4.2 if you create new files or folders, right click on the item and select TortoiseSVN > Add... to register that they should be linked to the repository. They will appear with a blue cross

4.3 if you want to register files for removal from the repository code, right click and select TortoiseSVN > Delete... (If you delete SVN registered files in the normal way this has no effect on the repository)

5. Commit changes to the repository

5.1 Before you commit (push) your changes to the repository, you should always update your copy of the code (for that file or for an entire folder) by pulling the latest changes from the repository. Right click on the highest level item that you want to refresh, select SVN Update...

SVN will automatically merge any changes from the repository to your copy of the code if it can. If there are conflicting edits within the same file it will open up a merge tool for you to manually merge the two sets of changes to resolve conflicts. This needs some care ! If updates and commits are done frequently and developers let the others know what files they will be working on then it should rarely need to be done.

5.2  After you have pulled the latest updates, push your changes to the repository by right clicking on the highest level item you want to submit, select SVN Commit...  Write a message in the log to describe what changes you have commited. All the red and blue flags will turn back to green ticks.