SVN allows files to be stored on a central server and, among other things we arent using, allows multiple people to use the same design, and remembers all the previous versions of the files. So, for example, you can retrieve a file you accidentally deleted, or you can get back an old copy of a file. Figure shows the main screen of RapidSVN. Left Area is the bookmarks area, Right shows the file area, and bottom holds the message area.
Bookmark Area For each of the projects you have downloaded to your machine, a bookmark is created. Clicking on a bookmark makes the 'file area' show all the files and directories in the design. Some things you may want to do are: Adding a design If a design you have downloaded is not shown in the list, you can add it manually.
Select the design that isnt being shown, and click 'OK'. Deleting a bookmark If you delete a design through windows explorer, you can remove its bookmark by right clicking on the bookmark and clicking 'Remove Bookmark Problems If when you click on a bookmark, the 'file area' goes grey and a message 'Error while updating filelist' appears in the message area, then it means that the folder the bookmark points to does not contain the SVN data files.
This will happen if any '. RapidSVN should now show the bookmark properly. File Area Each of the files and directories of the bookmark you have selected are shown here, along with some information describing their status. Figure shows an example of what the file area could look like. The most useful columns are: Name The name of the file.
The icon identifies its 'status' described below. Revision This is the version number of the file on your local machine. This is the version when the file was last modified. Author The name of the person who commited the last change to the file. Status Describes the status of the file. The most common status values are blank, 'unversioned', 'modified', 'added', 'deleted', 'missing' and 'conflict', and are described below.
There may be a newer version on the server see the section on 'Updating files' if you want to check for newer versions. You may want to leave the file like this, as with 'file2. If you want to add the file, see the section on 'Adding files'. If you want to send these changes to the server so everyone else can see them, see the section on 'Commiting Files'.
If you did not mean to modify the file and want to go back to the last version you downloaded, see the section on 'Reverting Files'. If you have an 'unversioned' file and want to add it to the server, see the section on 'Adding files'. If you have a file that is marked as "added" and you want to send it to the server, see the section on 'Commiting files'. If you do not want to add the file, see the section on 'Reverting files'.
If you have a file you want to delete from the design, see the section on 'Deleting files'. If you have a file that is marked as "deleted" and you want to send the change to the server, see the section on 'commiting files'. If you do not want to delete the file, see the section on 'Reverting files'. If you want to delete files, see the section on 'Deleting files'.
If you have deleted this file through windows explorer by mistake and want to get it back, see the section on 'Reverting files'. This may happen when you are getting new versions of a file, and RapidSVN discovers that you and another person have both modified a file, and they have sent their modifications to the server already. If RapidSVN just sent your file to the server, all the other persons changes wouldnt be available.
When a conflict occurs, three more files are created, in this example they are 'file6. See the section on 'Resolving conflicts' for what to do. Updating Files Updating is the process of getting new versions of files from the server, it does not involve sending your new versions to them for sending your changes, see the section on 'Commiting files'. To update files, right click on them in the file area and click 'Updata The dialog box in Figure will be shown.
You want to get the latest version of a file, so make sure 'Use latest' is ticked. If you are updating a directory, and want to also update all files inside it, tick the 'Recursive' box. You can leave the 'Recursive' box ticked if you are just updating a single file.
Once you click 'OK' the file will be updated if there are any new versions available. If you are updating a file that you have modified, but not committed, you may end up with a conflict.
To resolve this, see the section on 'resolving conflicts'. For example, if you have put a file called 'file1. To add the file to the design, you right click on it, and click 'Add'.
The file is not actually sent to the server until you commit it, see the section on 'committing files' for how to do this. This allows you to add several files, and commit them all at once. Deleting files To delete a file from a design, you right click on it and choose 'Delete', the dialog box in Figure will be displayed. If the file is marked as "modified", you will not be able to delete the file unless you tick the "Force removal" box.
The file is not deleted from the server until you commit it, see the section on 'committing files' for how to do this. This allows you to delete several files, and commit them all at once. If you have a file with the status of 'deleted' and you decide that you didn't want to delete it, you can get back the last version that you downloaded from the server by reverting if, see the section on 'reverting files' for how to do this.
Committing files Committing is the process of sending your changes to the server so that everyone else can see them. You will want to commit files when you have modified them, or when you want to finish adding or deleting them.
To commit files, select them, right click on one of them, and choose 'Commit The dialog shown in Figure will be shown This lets you enter a message describing the changes you have made, or anything else you want to say. If you tick the 'Recursive' box and are committing a directory, everything in that directory and all lower directories will be committed. If you get an error in the message area like: Error while performing action: Commit failed details follow: You will need to update the file see the section on 'updating files' before you can commit it.
If you have also modified the file, updating it will cause a conflict, so see the section on 'resolving conflicts' for how to fix this. If you want to view the log messages from a file, see the section on 'File Logs'. Reverting files Reverting a file means going back to the last version that you got from the server, and it may not be the latest version that exists.
For example, if you mark a file for addition or deletion, or modify it, and then decide you didn't want to do that, you can revert it so that it wont be added, deleted or modified. To revert a file, right click on it and choose 'Revert', the dialog in Figure will be shown. As the dialog says, it will only revert local changes, so there may still be newer version on the server which you can get by 'updating' after you have reverted.
For example, user A and user B download revision 1 of a file. If user A makes changes and commits it, the version on the server is now revision 2. If user B makes changes to revision 1 and tries to commit it, the server sees that user A's changes would be lost, and informs user B that they need to get user A's modifications first.
User B now needs to update their version to incorporate A's changes into their file before committing it to the server. Now that you know how a conflict can occur, this is what to do about it. In Figure a conflict has occurred with 'file6. When a conflict occurs, three other files, 'file6. The file with the low r number, in this case 'r12', is the original file that you modified, and the file with the high r number, 'r13', is the latest version on the server.
What you need to do is merge the changes from your modified '. The steps to resolve the conflict differ depending on whether it is a cosmos rsn file or something else. The following steps show how to resolve conflicts for rsn files assuming that the file with the conflict is 'test. Go the the temporary directory and rename the '. In RapidSVN, right click on the file with the conflict the icon with the red 'C' and choose 'Resolve Conflicts' which deletes all the '.
You now need to commit the merged file. The following steps are for files that aren't vis e. Delete the file that has the conflict image. Load the three files in the editor and decide which one should be kept.
If you want to have parts from each file, you will need to merge them however is appropriate for the type of file. Save the file you want to keep, or the merged file you created, as 'image. File Logs If you want to view the messages that people have left when committing a file, right click on the file and choose 'Log A dialog box like Figure will be shown. You can see that this file has been committed for revisions 14, 18, and 19, and by clicking on the revisions you can see the respective commit messages people have left.
To do this, first make sure that any changes you have made to the file have been either committed, or if you don't want to do this, backed up somewhere else. Right click on the file and choose update, and untick the 'use latest' box. Enter the revision number that you want to retrieve and click ok. If you want to get an old version of a design and still keep your local copy of the latest one, you need to use the 'Checkout' option in RapisSVN's 'Repository' menu.