Re: Issue 13 in foss-lab-manual: Version Control with Subversion

foss-la...@googlecode.com

unread,

Jul 14, 2011, 8:27:18 AM7/14/11

to foss-lab-...@googlegroups.com

Comment #2 on issue 13 by vijayku...@bravegnu.org: Version Control with
Subversion
http://code.google.com/p/foss-lab-manual/issues/detail?id=13

The following tasks were extracted from one of my SVN presentations. The
attached tar ball has a SVN repo, to be used with the tasks. Hope this is a
useful starting point for developing the SVN lab sessions.

Checking out and Committing

# Check out book project from your repo
# Add the author in chapter-1.txt and chapter-2.txt
# Commit the changes made, with a meaningful log message

Diffs and Local Modification Status

# The chapters 1 and 2 have "freedom" spelled incorrectly as "fredom"
# Fix these spelling errors.
# Check the status of the files.
# Do a diff to verify the changes.
# Commit the changes.

Remote Modifications and Merging

# There is a word missing in chapter 3, line 8.
# Make yet another checkout B of the book.
# Goto checkout B, in chapter 3, line 8, replace ??? with 1984
# Commit the change
# Go back to checkout A of the book
# Check to see if there are updates in repo
# Do an update and get the changes

Conflicts

# There is a word "neighbour" missing in chapter 1, line 23
# Goto checkout B, in chapter 1, line 32, replace ??? with "neighbour"
# Commit your change
# Goto checkout A, and replace ??? with "neighbor", the American spelling
# The change cannot be committed, since it is not the latest revision of
the file
# Do an update, it will result in a conflict.
# Resolve the conflict and commit.

Viewing History

# Find out the modifications made in chapter 1.
# Find out the differences from revision 1 to current revision of chapter 3.

Tree Modifications

# Create a new file called chapter-4.txt
# Add the file to the repo
# Chapter 3 should really have been chapter 5
# Rename chapter-3.txt to chapter-5.txt

Going Back in Time

# Go back to revision 1 of the repository.
# Verify it, by checking the author name in chapter-1.txt and
chapter-2.txt

Attachments:
svn.tar.gz 10.7 KB