![]() ![]() For efficiency, the SVN server only stores the differences between each revision and the data is also compressed. There is an option to lock files when checked out to prevent conflicts, the downside to this is that only one user can checkout a file at a time.Įvery revision in the repository can be accessed, the user can check out any of these earlier revisions from the very first revision to the head revision. ![]() The user has to update their sandbox to retrieve the head revision of the file and then merge their – if this is a text file then the merge is usually performed automatically. A conflicted file cannot be committed to the repository. they have modified a file that is now out of date with the repository). Users can add other comparison tools for other file types in the SVN settings.Ī conflict occurs when a user modifies a file in their sandbox which has since been modified and committed to the repository by another user (i.e. In addition to ASCII files, comparisons can also be performed with Word and Excel documents. Version controlled files that are in the ASCII format can be compared with the version in the repository to show the changes that have been made… During the commit process the user enters a log of a description of what’s been changed.… Once the user has finished working on the files they can ‘commit’ the files back to the repository. Icon overlays are used to indicate whether a file is unmodified, modified, conflicted, added or unversioned… SVN stores every single revision so nothing is ever lost. When a user wants to work on a project, they ‘checkout’ the project they want to work on from the repository and this ‘copies’ the files from the repository to the users local drive (known as the users ‘sandbox’ or ‘working copy’).ĭuring the checkout the user can choose whether they want to check out the latest revision (known as the ‘head’ revision) or an earlier revision. ‘Tortoise SVN’ is the client that the user installs on their machine and this integrates with ‘File Explorer’ by right clicking the mouse button. For basic version control the user can simply use the trunk directory. The branch and tag directories are optional depending on your development method.
0 Comments
Leave a Reply. |