Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 4.0

...

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

In the latter part of the course which involves writing some reasonably large Java programs, students are 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.

Since we are using the OwlSpace system for assignment submission, the use of svn is purely optional for students' benefit. With svn students can always recover prior versions of the program that you have committed to the svn repository.

File Names and Directories

...

File names Files should be named with partner netIDs separated by a hyphen followed by a hyphen and the assignment abbreviation and either the .ss extension (for Scheme programming assignments requiring only a single file) or the .zip extension (for Java assignments consisting of multiple files). For example, the program file for hw01 (in Scheme) submitted by ids gcw5217 and gmalecha should be called gcw5217-gmalecha-hw01.ss . Similarly, the program file for hw07 consisting of a .java program file and a .java unit test file (with the file names specified in the assignment specifications) submitted by ids gcw5217 and gmalecha should be called gcw5217-gmalecha-hw07.zip .

svn Repository Information

Subversion (abbreviated svn) is a system for maintaining the version history of a program code base. In Comp 211, assignments are reasonably small, so using subversion is optional. But subversion maintains a history of all the committed versions of a program, so it prevents you from losing code if you trash your own file system (e.g., your machine has a disk crash). For early Scheme assignments (which are really small), using subversion is probably overkill.

Repository Url:

https://svn.rice.edu/r/comp211/

<ac:structured-macro ac:name="unmigrated-wiki-markup" ac:schema-version="1" ac:macro-id="3b079389-7552-428d-ba12-ba422dc1c14f"><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="b1933be3-0850-4e50-b2a5-9522986ba741"><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.

Running svn on Linux

While some graphical clients may exist for Linux, subversion's command line interface is simple and powerful and is the recommended method for accessing subversion from a machine running Linux.

...

.

...

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]

...

Code Block

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

...

Code Block

svn update

...

A typical subversion session might look something like this.

Code Block

/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.

...

Running svn on Windows

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.

...

Creating your directory

...

Adding a file to your directory

...

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""/>

...

Updating your directory

...

Running svn 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

Access Permissions: (Please don't edit)

...