Intro to Subversion

SVN for CVS People

Subversion operates on changesets rather than individual files. As a result, revisions cover changes across multiple files. Furthermore, revisions persist

General Practices

• When renaming a file, use the SVN Rename command. This preserves history.
• Please write messages in the log. This helps observe progress.
• Do not commit compiler output. This output changes almost every time someone compiles, and it will cause merge headaches all around.
• Commit project shared options. Do not commit personal options.

SVN/Trac

• It is possible to use many of the TracWiki items in the SVN log. The results of which will appear in the Timeline. This can be especially useful when closing tickets with particular commits.

SVN Clients

There are two convenient ways of checking out the repository: TortiseSVN and Subclipse.

TortiseSVN

TortiseSVN can be downloaded here. Make sure to get the latest version. Make sure you do not install the .NET hack as it is incompatible with all other SVN clients. Installation requires a reboot.

To check out the code,

1. Create a new folder somewhere convenient.
2. Right-click on the new folder. Choose SVN | SVN Checkout.
3. Use the following URL: https://trac.cs.unc.edu/svn/games
4. Use your CS login and password. If your UNIX password does not work, try your Windows password.
5. Done!

To update relative to the repository,

1. Open the root folder containing the checkout (the folder containing trunk, tags, and branches).
2. Choose File | SVN Update.
3. Review the status window for any conflicts. Resolve any conflicts.
4. Done!

To resolve conflicts,

1. Right click on the conflicted file in the update status window. Choose an appropriate option.
2. If you choose to edit the conflicts manually, the TortiseMerge program will load.
   1. You can step by step pick blocks from your version and the latest version.
   2. Be sure to save your changes and mark the file as resolved before exiting the program.

To commit changes and to add to svn:ignore,

1. Perform an update.
2. Open the root folder containing the checkout (the folder containing trunk, tags, and branches).
3. Choose File | SVN Commit ...
4. Add checkboxes to added files. Right click on permantently undesired files (undesired in the sense of commiting, not keeping) (e.g. compiled output files and folders), and choose the apropriate ignore option.
5. Write a useful commit message.
6. Click Ok. When prompted, enter your username and password (if this information was not saved). This should be the same account information as used for Trac.
7. Done!

Subclipse

Subclipse can be downloaded through the Eclipse updater. Directions for installation can be found here.

To check out the code,

1. Open the SVN Repository Exploring Perspective
2. In the SVN Repository frame, click on the Add SVN Repository toolbar button
3. Use the following URL: https://trac.cs.unc.edu/svn/games
4. Expand the directories to find a folder containing a .project file. Right-click on this folder. Choose Checkout....
5. Ensure Checkout as a project in the workspace is selected. Give the project a unique name.
6. Click Next. Click Finish.
7. Done!

To update relative to the repository,

1. Open the Flex Development Perspective
2. In the Flex Navigator frame, right click on the project root node. Choose Team | Update
3. Resolve conflicts, if any.
4. Done!

To resolve conflicts,

1. (Steps to follow...)

To commit your changes,

1. Perform an update
2. Open the Flex Development Perspective
3. In the Flex Navigator frame, right click on the project root node. Choose Team | Commit...
4. Add checkboxes to added files.
5. Write a useful commit message.
6. Click Ok. When prompted, enter your username and password (if this information was not saved). This should be the same account information as used for Trac.
7. Done!

To add to svn:ignore,

1. Open the Flex Development Perspective
2. In the Flex Navigator frame, right click on the undesired file. Choose Team | Add to svn:ignore
3. Follow any on screen instructions.
4. Your changes will not take effect until you commit at least the containing folder.