Page History

...

For this class, students will use the OwlSpace system to turn in
assignments.

Students are also encouraged to use svn (subversion) to keep a cumulative record of the code they write for assignments.
There are many resources available online if you want to learn more about subversion and its advanced features.

...

SVN Repository information

Repository Url: {{	https://svn.rice.edu/r/comp211/ Image Removed }}
<ac:structured-macro ac:name="unmigrated-wiki-markup" ac:schema-version="1" ac:macro-id="e918395b4820a93f-7bf93cce-4d334b57-92b2a0f5-72c30dab411f3ba0e2bdfbe1"><ac:plain-text-body><![CDATA[	User Name:	[your rice netid]	]]></ac:plain-text-body></ac:structured-macro>
<ac:structured-macro ac:name="unmigrated-wiki-markup" ac:schema-version="1" ac:macro-id="c9b04239d74ce2ff-d32caeb2-406b4300-838ab4b2-f5b97d3dc1400d22342ee59d"><ac:plain-text-body><![CDATA[	Password:	[your rice password]	]]></ac:plain-text-body></ac:structured-macro>

If you have questions about subversion, please contact one of the labbies and we will respond as soon as we can.

...

1. Install svn Installing subversion varies based on the linux distribution that you use. Simply check your package manager ( apt-get , emerge , etc.) for a subversion or svn package and install it the same way that you install all other packages.
2. *Create a comp211 directory.

3. Wiki Markup
   *Adding a file to the repository* To add a file to the repository, save the file under your repository directory \(the {{comp211/\[netid\]}} directory created by the {{svn checkout}} command\) and, from the directory that it is saved in, execute the command.

   Code Block
   svn add [filename]

4. Committing a file to the server To save your work so that it can be recovered, you must send it to the server (called committing your work). To do this, from the comp211 directory, execute

   Code Block
   svn commit -m "[message describing your change]"

5. Updating the repository You can update your copy of the repository by executing

   Code Block
   svn update

   Any work that has been committed to the repository will be copied to your disk and, if there are conflicts, you will have to resolve them.

...

/tmp $ svn --username gmalecha co https://svn.rice.edu/r/comp211/
A    comp211/gmalecha
Checked out revision 21.
/tmp $ cd comp211/gmalecha
/tmp/comp211/gmalecha $ touch test.file   
/tmp/comp211/gmalecha $ svn add test.file
A         test.file
/tmp/comp211/gmalecha $ cd ..
/tmp/comp211 $ svn commit -m "Added a test file"
Adding         gmalecha/test.file
Transmitting file data .
Committed revision 22.

...

You can download a Windows version of the command line client from the Subversion site. However, you will probably want to use TortoiseSVN, a graphical client for Windows.

...

1. Download and install the latest version of TortoiseSVN from: http://tortoisesvn.net/downloads
2. Check out the repository In the folder where you want to keep your COMP 211 work, right click and select "SVN Checkout...":
   Image ModifiedTortoiseSVN Check Out menu option""/>
3. Enter the repository URL Enter https://svn.rice.edu/r/comp211/Image Removed as the repository URL.:
   
4. Accept the certificate Click "Accept permanently":
   
5. Enter your netID and password Enter your netID and password in the correct fields:
   

   Anchor
   WindowsAdd WindowsAdd

Adding a file to your directory

1. Wiki Markup

   *Adding a file to the repository* To add a file to the repository, save the file under your repository directory \(the {{comp211/\[netid\]}} directory created when you checked out the repository\). Then, right click on it and select "Add..." from the "SVN" menu. !http::^hope.cs.rice.edu/twiki/pub/Teaching/SvnTurnin^windows_add.png|width=32"799", height=32"599", alt="The"<span class=!TortoiseSVN Add menu option"!"/>

2. Select the files to add Click "OK".
   
3. Wait for the files to be added Click "OK".
   
4. Committing a file to the server In order for other people (namely the graders) to view your local work, you must send it to the server (called committing your work). To do this, from the comp211 directory, right click and select "SVN Commit...":
   Image ModifiedTortoiseSVN Commit menu option""/>
5. Enter a message Describe what changes you have made. Then click "OK":
   
6. Wait for the files to be sent to the server Click "OK":
   

   Anchor
   WindowsUpdate WindowsUpdate

Updating your directory

1. Updating the repository You can update your copy of the repository right clicking in the comp211 folder and selecting "SVN Update":
   Image ModifiedTortoiseSVN Update menu option""/>
2. Wait for the files to synchronize Click "OK":
   
3. Assuming that there were no conflicts (changes made to the same file), you now have an up-to-date copy of your repository.

   Anchor
   MacTurnin MacTurnin

Turnin in Mac

You can download a command line client for the Mac. After installing it, it works just like the Linux command line client. See the Linux section for further instructions.

Subversion Resources

• The SVN Command Line Client Guide from COMP 314 http://www.owlnet.rice.edu/~comp314/svn.html

...