Subversion Notes

Once you have installed subversion, you will have a local copy of the full documentation (see the Subversion folder in Programs).

Getting Started

Create a folder on your disk to work in (e.g., call it 'groupwork').
Right click in your file browser on this folder. Select 'SVN Checkout'.
You will be prompted for a URL. Yours is in the form of:
svn+ssh://cses1@csnsvn.cs.ou.edu/home/svn/cses1
with the "1" substituted with your group number.
You will then be prompted for your group's password.
The initial checkout will take a few seconds. After this is complete, you will have a complete copy of your group's subversion repository. Within your groupwork folder, you will find several folders, including: lib, include, project1, project2, etc.
Note that these are only local copies of your group's folder. You will have to take additional steps to share your changes and to receive changes from your other group members (see below).

Using Subversion

To receive changes to existing files or any newly added files:
- right click on the groupwork folder
- select SVN Update
- once you enter the password, you will receive copies of new and changed files
To select a file to share:
- right click on the file
- select Tortoise SVN and then select add
- Note: your file has not actually been shared (see the next step)
To upload new and changed files:
- right click on the file or on the folder
- select Commit
- once you enter the password, the selected files or folders will be copied to the main server

File/Folder Color Codes

Once a file/folder is part of a subversion repository, your file browser will color code the icons. Here are the key colors:

Green check mark: you have not made changes to the file since you last downloaded or uploaded the file.
Red exclamation point: you have made a change to the file
Blue question mark: the file/folder has not been added to the repository (see Add above)

Notes

Subversion maintains a history for all of your files. If you delete a file from your local folder, you can always get the most recently committed version of the file by simply doing an update on the folder. (in fact, there are ways to also get older versions of files).
If two people are editing the same file at the same time, you can find your file in a conflicted state. This can lead to an uncomfortable process of hand-resolving the two sets of changes to the file. Avoid this at all (or most) cost.
When a conflict happens, svn will deposit four different files into your folder:
- foo.c: (I am assuming that this is the original name of your conflicted file). This will contain svn's best guess at how your changes should be combined with the other person's changes. There will often be some additional lines added such as "<<<<<<", ">>>>>>", or "======". These lines demark where your changes are different from the other persons.
- foo.c.mine: this contains your file right before you tried to commit/update
- foo.c.rX (where X is some number): this is the last version of the file that was checked into svn before you and the other person started editing (this was the starting point for both of you)
- foo.c.rY (where Y > X): this is the last version of the file that was checked in. This incorporates changes that were made by the other person.
  You can choose any one of these four files to start with. Then:
  - If you want to use one of the files that is different than foo.c, then delete foo.c and rename the file that you want to keep to foo.c
  - Right click on the file and select: "Subversion/resolved". This indicates to svn that the conflict has been resolved
  - Right click on the folder and select "Commit"
It may make sense for your group to share the AVRStudio aps and aws files (doing so means that only one person has to set all of the configuration options). However, AVRStudio updates these files every time you save the project. In many cases, these updates are trivial and unimportant. However, they will probably lead to conflicts. In this case, the simple way to resolve the conflict is to delete your local copy of the aps and aws files and then to do an update to fetch a fresh copy. (we will have to experiment with what works best here)

fagg@cs.ou.edu

Last modified: Tue Mar 8 16:18:21 2011