Important Tips 1

Rule 1 : Commit Early, Commit Often !

Rule 2 : Commit Work Flow ( Very Important ) :

When You Start Working :

1) Update (or Checkout If It's the first time)

2) Work On Project ( make changes / add code )

3) Build the Project & Make Sure it Compiles.

When You Are Done Working and Want to Submit Your Code :

4) Update Again [Before Comming]

5) Build the Project & Make Sure it Compiles [ Otherwise Resolve any Conflicts ]

6) Commit

TortoiseSVN Tutorial

How to checkout the repository files, make some modifications, then commit the changes.

1. Create a folder to store the repository files in. Right click the folder and select SVN Checkout
2. Set the repository address in the URL field, then click OK
3. The repository will be checked-out, and you'll see the revision number
4. Files now are stored in the folder. The green check mark means that the repository has not been changed. You can go ahead and start adding\editing folders and files.
5. Modified files will have an exclamation mark (!). If you add new files, they don't have any mark because they are still not part of the repository.
6. To commit changes, go to the main folder (that you've created initially). Right click and select SVN Commit
7. The commit box will show up. You can see the added\changed files. Write a commit message (describing the changes you've made), make sure you select all files, then click OK
8. Changes will be commited to the SVN repository. You'll see a message showing the new revision number.

How to detect and resolve conflicts

A conflict happens when you try to commit changes that are based on a revision that have been updated by someone else. For example, you checkout the last revision, r6, and started to work with it. At the same time, someone else committed some changes and updated the revision to r7. Your changes are now conflicting

1. When you try to commit changes, you'll get an error message that some files are out-of-date.
2. You now have to resolve the conflict. To do that, right click the repository folder, and click SVN Update. This command updates your current repository with the latest version of files. If you have changed some files, it will try to resolve the conflict. If it couldn't, you will have to resolve it manually
3. The Update command will find conflicts, and inform you what files are conflicting.
4. After the update finishes, go to the folder that has the conflicting files. You'll see 3 versions of each file:
- The original version of the previous revision (that you based you work on)
- The file of the newer version (that was modified by someone else)
- The file that you have modified (my modifications .. "mine"!)
5. Now, you have to resolve the conflict. The usual way is to open the newest version (that someone else have edited), and apply your changes to it. After you finish, remove all the extra copies of the file except the one that you actually want to commit. When you delete the extra files, the icon will change from yellow to red. You can now commit your changes.

How to browse the revisions and view all the changes made to files

SVN keeps record of ALL the modifications and changes that happen to files in every revision. It can also show you what exactly was changed in each file.

1. Right click the repository folder, go to TortoiseSVN menu, and select Show Log.
2. The log window will show you all the revisions, who committed it, and the commit messages. Select any revision you want to review, and you'll see the details of it. The list of added\deleted\modified files are also shown.
3. To view the changes that was made to a specific file, double click the file name in the file list, you'll see a window with 2 panels, showing the file of the previous revision, and the file of the new revision. All the changes (added lines, removed lines, changed characters, etc) are highlighted.

Credits for this tutorial goes to (Abdulaziz Al-Baiz) from the Scheuler Project.