Subversion (SVN) Tutorial for CS421
Dan Fleck Spring 2010
What is version control?
Version management allows you to control and monitor changes to files
What changes were made? Revert to pervious versions When were changes made What code was present in release 2.7?
Earliest tools were around 1972 (SCCS) Older tools RCS, CVS, Microsoft Source Safe, PVCS Version Manager, etc Current tools Subversion, Mercurial, Git, Bazaar
We will use subversion (svn)
Why?
Because its popular Its well supported
IDEs - Netbeans, Eclipse Numerous GUI tools Command line XP Dev has support for it (you will use this for your semester projects)
subversion concepts
checkout get a local copy of the files
I have no files yet, how do I get them?
I created a new file and want to check it in Ive made changes, how do I send them to the group?
add add a new file into the repository
commit send locally modified files to the repository
update update all files with latest changes
Other people made changes, how do I get them?
I want to turn in a set of files
tag / branch label a release
Creating a new repository
Command Line:
Open command prompt Go to a directory where you want your files to be stored svn checkout <<location>>/svn/<<your project>>/
GUI Mac OSX SCPlugin
Adds commands to right-click menu in Finder
GUI Windows Tortoise SVN
Adds commands to right-click menu in Explorer
Creating a new repository - Mac SCPlugin
Create Repository Mac OSX
Create a repository using Tortoise SVN
I need a tool that allows Windows screenshots with a timer. See: [Link] ontextmenus Open Windows Explorer Select a directory where you want your repository Right-click and select Create Repository Here
Add a file into repository
Copy a new file into the trunk directory
Tell SVN to include the file as part of the repository
Command line
svn add [Link]
GUI
Windows: right click choose: TortoiseSVN->Add Mac OSX: right click choose:More->Subversion->Add
This does NOT upload the file yet! The commit command will upload all new files and changed files
Commit changes
Modify a file contained in your repository
Command Line:
svn commit -m Added a new sequence diagram.
GUI
Windows: right click choose: TortoiseSVN->commit Mac OSX: right click choose:More->Subversion->commit
Update the message with what was changed in the file. This should be a meaningful statement someone can look at to determine what was changed
Update
Update gets all new changes from the repository.
svn update GUI Users: you should get it by now
What happens if there is a conflict?
User A has version 3 of the file, modifies it, commits it creating version 4. User B has version 3 of the file, modifies it, commits it
CONFLICT User Bs copy of the file was out of date. User B must merge their changes into Version 4
For text files (like source code) SVN can help do this in an automated way For binary files SVN cannot help must be done manually
Lesson: Always ensure you have the latest version (update frequently). If multiple people are editing the same file you could have problems
Summary Checking things in
1. 2.
3.
1.
Create the repository by svn checkout Copy your documents into trunk directory Use svn add to mark files to include in the repository
Use svn commit to send the files to the repository
4.
Modify files, svn commit as needed until your deliverable is complete
svn commit (dont forget the final commit!)
5.
Other notes
log command shows the log of changes to a file
diff command can shows changes between revisions (for text files only) These commands are all built-in to IDEs: eclipse, netbeans
Mac Users: the SVN command line that is bundled with Mac (at least Leopard) is old (and wasnt compatible for SCPlugin). You can update the command line tool at :
[Link]
SVN example
Checkout:
Lets try it with the test project for this class at
[Link] Note this is the SSH link (https)
Edit a file commit add update
