Differences

This shows you the differences between two versions of the page.

--- cs101:tortoisesvn:tortoisesvn [2020/10/27 13:31] – [Working with the checked out repository] localadmin
+++ cs101:tortoisesvn:tortoisesvn [2020/10/27 18:26] (current) – [Checking out a Working Copy] localadmin
@@ Line 5: / Line 5: @@
 ===== Getting Started with TortoiseSVN =====
-TortoiseSVN is GNU General Public License software that you can download for free. It is available for both 32-bit and 64-bit Windows.
+TortoiseSVN is GNU General Public License software that you can download for free. It is available for both 32-bit and 64-bit Windows. (The CS Department only supports 64-bit Windows.)
 ==== Basic SVN Concepts ====
@@ Line 13: / Line 13: @@
 Subversion maintains a central database which contains all your version-controlled files with their complete history. This database is referred to as the repository. The repository normally lives on a file server running the Subversion server program, which supplies content to Subversion clients (like TortoiseSVN) on request.
-=== Working Copy ===
+=== Working (Local) Copy ===
 This is where you do your actual work. Every developer has his own working copy, sometimes referred to as a sandbox, on his local PC. You can pull down the latest version from the repository, work on it locally without affecting anyone else, then when you are happy with the changes you made commit them back to the repository.
@@ Line 43: / Line 43: @@
 You should then get an Authentication box where you input your login and password you use for your SVN account. **Only leave the Save Authentication checkbox checked if on a private computer!**
-{{:cs101:tortoisesvn:tortoisvn_auth.png?direct&400|}}
+{{:cs101:tortoisesvn:tortoisvn_auth.png?nolink&400|}}
 You'll now see the progress of the checkout. All files and the folders that are included in the checkout will be logged.
@@ Line 61: / Line 61: @@
   * {{:cs101:tortoisesvn:tortoisvn_modified.png?nolink|}}Red Explanation Mark - File/Directory has been modified.
   * {{:cs101:tortoisesvn:tortoisvn_add.png?nolink|}}Blue Plus Sign - File/Directory is new (Has not been added to repository).
+  * {{:cs101:tortoisesvn:tortoisvn_conflict.png?nolink|}} Yellow Diamond w/Explanation Mark - File/Directory is in a conflicted state.
+==== Common Problems ====
+Occasionally you may get a conflict when you update/merge your files from the repository.
+There are two kinds of conflicts:
+  * File conflicts
+    * A file conflict occurs if two (or more) developers have changed the same lines of a file. This can also occur if one developer is working on code from two different computers.
+  * Tree conflicts
+    * A tree conflict occurs when a developer moved/renamed/deleted a file or folder, which another developer either also has moved/renamed/deleted or recently modified.
+Just remember to always do an update before working on a file.
+To address conflicts, you can either launch an external merge tool / conflict editor with TortoiseSVN --> Edit Conflicts or you can use any text editor to resolve the conflict manually. You should decide what the code should look like, do the necessary changes and save the file. Using a merge tool such as TortoiseMerge or one of the other popular tools is generally the easier option as they generally present the files involved in a 3-pane view and you don't have to worry about the conflict markers.
+==== Committing (Saving) Your Changes with TortoiseSVN =====
+Before you commit your changes, it is good practice to ensure your working (local) copy is up to date with the repository. To update your working copy, select the desired files or directories, right-click them and select Update from the TortoiseSVN context menu. A new screen will open displaying the update's progress. Changes performed by other team members will be merged into your files, but any changes you may have performed on the same files will be maintained.
+{{:cs101:tortoisesvn:tortoisvn_update.png?direct&600|}}
+When you have ensured your working copy is up to date, it's time to add your changes to the repository. Select the desired files or directories and hit the SVN Commit… command.
+{{:cs101:tortoisesvn:tortoisvn_commit.png?direct&600|}}
+SVN Commit… will open the commit dialog where you can perform a number of actions:
+  * Add a log message from the commit dialog. It's good practice to leave a log message as they can be useful if problems arise later.
+  * Prevent a particular file from being committed by unchecking the file.
+  * Show the log of previous actions.
+  * Hit OK to commit your changes to the repository.
+{{:cs101:tortoisesvn:tortoisvn_comment.png?direct&600|}}
+A commit dialog box will open showing the result of the commit process.
+{{:cs101:tortoisesvn:tortoise_shell.png?direct&600|}}
+More help can be found from [[https://tortoisesvn.net/support.html|TortoiseSVN support]].
+Loppu