Exercise 2.1

• ssh over to the head node and change your system and svn passwords

$ ssh nisl

$ passwd

$ htpasswd /etc/svn-auth-file username

• Check out your repository

$ svn co http://nisl.tamu-commerce.edu/repo/csci553/username labs

Exercise 2.2

• Create a file labs/lab02/bio.txt (where labs is the root of your working copy of your Subversion repository), and write a short biography of yourself (50 words or so) of the kind used in academic journals, conference proceedings, etc. Add and commit this file to your repository. Remember to provide a meaningful comment when committing the file.

Exercise 2.3

• What's the difference between mv and svn mv? Put the answer in a file called labs/lab02/mv.txt and commit your changes.

• Once you have committed your changes, type svn log in your course directory. If you didn't know what you'd just done, would you be able to figure it out from the log messages? If not, why not?

Exercise 2.4

• In this exercise, you'll simulate the actions of two people editing a single file. To do that, you'll need to check out a second copy of your repository. One way to do this is to use a separate computer (e.g., your laptop, your home computer, or a machine in the lab). Another is to make a temporary directory, and check out a second copy of your repository there. Please make sure that the second copy isn't inside the first, or vice versa—Subversion will become very confused.

$ cd ~

$ mkdir tmplabs

$ cd tmplabs

$ svn co http://nisl.tamu-commerce.edu/repo/csci553/username labs

• Let's call the two working copies Blue (your original good version) and Green (the one you just created in tmplabs). Do the following:

a) Create Blue/lab02/planets.txt, and add the following lines:

Mercury

Venus

Earth

Mars

Jupiter

Saturn

Commit the file.

b) Update the Green repository. (You should get a copy of planets.txt.)

c) Change Blue/lab02/planets.txt so that it reads:

1. Mercury

2. Venus

3. Earth

4. Mars

5. Jupiter

6. Saturn

Commit the changes.

d) Edit Green/lab02/planets.txt so that its contents are as shown below. Do not do svn update before editing this file, as that will spoil the exercise.

Mercury 0

Venus 0

Earth 1

Mars 2

Jupiter 16 (and counting)

Saturn 14 (and counting)

e) Now, in Green, do svn update. Subversion should tell you that there are conflicts in planets.txt. Resolve the conflicts so that the file contains:

1. Mercury 0

2. Venus 0

3. Earth 1

4. Mars 2

5. Jupiter 16

6. Saturn 14

Commit the changes (hint also need svn resolve).

f) Update the Blue repository, and check that planets.txt now has the same content as it has in the Green repository.

Exercise 2.5

• Add another line or two to labs/lab02/bio.txt and commit those changes. Then, use svn merge to restore the original contents of your biography (labs/lab02/bio.txt), and commit the result. When you are done, bio.txt should look the way it did at the end of the first part of the previous exercise.) Note: the purpose of this exercise is to teach you how to go back in time to get old versions of files—while it would be simpler in this case just to edit bio.txt, you can't (reliably) do that when you've made larger changes, to multiple files, over a longer period of time.