SVN features detailed
TortoiseSVN is a very good SVN Client tool in windows. By using it, we can visualize the management of our version library. However, because it is only a client, it does not have permission management for the version library.
TORTOISESVN is not a stand-alone window program, but is integrated in the Windows right-click menu, easy to use.
TortoiseSVN what each menu item means
01,SVN Checkout (svn out)
Click on the SVN Checkout, pop up the checkout prompt box, enter the server warehouse address in the URL of repository input box, and in the Checkout directory input box Enter the path to the local working copy, and click OK to check out the configuration library on the server.
02,SVN update (svn updates)
If the configuration library already has a working copy locally, get the latest version just to perform svn update, click SVN update, the system pops up the update box, click OK, then update the server with the latest version
03, Import (Imports)
Select the directory to submit to the server, right-click to select TortoiseSVN----import, the system pops up the import prompt box, enter the Server warehouse address in the URL of repository input box, and in the Import message input box Enter the import log information and click OK to import the file into the server repository.
04, add (Add)
If you have multiple files and folders to submit to the server, we can first add the files to submit to the submission list, to perform the submission, to submit all the files at once, such as the figure, you can select the file to submit, and then click Execute Submission (SVN Commit), you can submit all files to the server at once
05, resolving Conflicts (conflict resolution)
Sometimes you have a conflict with updating files from the archive. The conflict arises when both people modify a part of the file. Conflict resolution can only be done by man, not by machine. When there is a conflict, you should open the conflicting file and find the line to start with <<<<<<<. The conflict section is marked:
<<<<<<< filename
Your changes
=======
Code merged from repository
>>>>>>> Revision
Subversion generates three additional files for each conflicting file:
Filename.ext.mine
The local file before the update.
Filename.ext.rOLDREV
You make changes to the base version.
Filename.ext.rNEWREV
The latest version from the archive when it is updated.
Resolve the conflict by using the Edit violation edit conflict command for the shortcut menu. Then execute the resolved resolved command from the shortcut menu and send the changes to the archive. Please note that the resolution command does not resolve the conflict, but simply deletes the filename.ext.mineandfilename.ext.r* file and allows you to send it.
06, check for modifications (check update)
Click Check for modifications, the system list so the status of the files and folders to be updated.
07, Revision Graph (version branch diagram)
To view the branch of the file, the version structure, you can click Revision graph and the system displays the version branch graphically.
08, Rename (renamed)
SVN Support file renamed, click Rename, pop-up file name input box, enter a new file name, click OK, and then change the submission, you can complete the file rename
09. Delete (delete)
SVN Support file deletion, and easy to operate, convenient, select the file to delete, click Delete, and then submit the delete operation to the server
10, Moving (mobile)
Select the files and folders to be moved, and hold down the right mouse button to drag the Right-drag file (clip) to the new location in the tracking copy;
11, Revert (Restore)
Restore operations, such as deleting a file just now, now restore it back, click Delete, and then click Submit, will appear as the prompt box, click Delete, then click Revert, that has been undone delete operation, if this time click Submit, then the System pop-up prompt box: No file has been modified or added, can not be submitted
12, Branch/tag (branch/Mark)
When you need to create a branch, click Branch/tag, in the pop-up prompt box, enter the branch file name, enter the log information, click OK, Branch to create success, and then see the version of the file branch
13. Switch (toggle)
When you create a branch of a file, you can choose to work in the trunk or in a branch, where you can switch.
14, Merge (merger)
The trunk and branch versions are merged, and the source and destination input file path, version number, click OK. The system merges the files, and if there is a conflict, refer to the conflict resolution.
15, export (exported)
Export the entire working copy to the local directory, the exported file will not have the svn file flag, and the file and folder do not have a green "√" symbol flag.
16, relocate (reposition)
When the repository directory on the server has changed, we can reposition the working copy and enter a new address in the to URL input box
17, add to Ignore list (added to ignore list)
Most projects will have some files (folders) that do not require versioning, such as compiled *.obj, *.lst, and so on. Each delivery, TortoiseSVN prompted those files do not need to control, very annoying. You can then add these files to the Ignore list.
18,SVN Other related functions
Client modifies user password:
Open the browser, enter HTTP://192.168.1.250/CGI-BIN/CHANGEPASSWD in the Address bar, start the client to modify the user password interface, enter the correct username, old password, new password (note that the number of digits should be no less than 6, try to use a safe password ), click Modify.
19.SVN Commit (version submission)
Submit the changes you made to your work copy to the repository so that others can see your changes when they get the latest version (update).
20, show log (display logs)
Displays all modification histories for the current file (folder). SVN support File and folder independent version traceability.
21, Repo-browser (view current version library)
View the current version library, this is the TortoiseSVN View version Library portal, through this menu item, we can go into the configuration library of the resource manager, and then we can manage the folder of the configuration library, equivalent to open My Computer for file management.
22, Revision graph (version graphics)
View the revision history diagram for the current project or file. If the project is larger, there will typically be multiple branches and multiple milestones (stable release), through which we can see the full picture of the project.
23, resolved (conflict resolution)
If there is a conflict between the current working copy and the version library, and cannot be automatically merged together, then when you submit the change, TORTOISESVN will prompt you to have a conflict, at which point you can resolve the conflict through this menu item. There are two ways to resolve a conflict, one is to keep a copy, such as using a configuration library to overwrite the current working copy, or vice versa. There is also a manual resolution of the conflict, and for text files, you can use the TortoiseSVN tool, which lists where the conflict exists, and then you can discuss with the submitter how to resolve the conflict. It also has good support for word.
24, update to Revision (updated to version)
Gets a history version from the version library. This feature is primarily convenient for viewing historical versions instead of rolling back versions. Note: After getting down, no action is recommended for this file. If you make a change, then SVN will prompt you when you submit the current version is invalid (that is, not the latest version), cannot submit, need to update first. The changes you have made will be in vain.
25, Revert (rollback)
If you make some changes to your work copy, but you don't want it, you can use this option to undo the changes you made.
26, Cleanup (Clear State)
If you have any problems with your current working copy, you can use this option to fix it. For example, some files were originally version controlled, but you deleted them without tortoisesvn, but TortoiseSVN kept the original information (one under each folder). svn 's hidden folders, which contain version information for all folders under the current folder, so there are some conflicts. You can use cleanup to clean up.
27,Getlock/releaselock (lock/unlock)
If you don't want someone to change a file, you can lock it up so you can make sure that you have the right to modify the file. Unless you release the lock, no one else can commit any changes to the Config library
28, Branch/tag (Branch/label)
Branch is the meaning of a branch. For example, when the design of a thing, different people have different implementations, but not tested by practice, who do not want to directly cover the other people's design, so you can draw different branches. You can merge these branches in the future if you want.
Tag is the meaning of marking. Usually when the project is developed to a certain extent, it can be run stably, it can be labeled as a stable version. A particular version can be easily found in the future (of course we can use the version number to find it, but the numbers are inconvenient after all)
SVN for branches and tags are similar to Linux under the hard link (the same file can exist in two places, delete one does not affect the other, the changes will affect the other) to manage the file, rather than simply copying a copy of a file, So there is no problem of wasting storage space.
29, export (exported)
This function is convenient for us to deploy. When we need to release a stable version, we can use this feature to export the entire project to a folder, and the new folder will not contain any version information.
30, relocate (version library transfer)
This function is needed when our version library is transferred. For example, my original library was built on a U disk, now transferred to (copy the entire Configuration Library folder) on the development server, using HTTPS instead of file system access. It is therefore necessary to relocate the target version library of the original working copy to the development server.
31, create patch (creating a patch)
Create a patch. If the administrator does not want anyone to submit changes, but all have to be audited to make changes, then other people can create patches by the way, the modification information (patch file) sent to the administrator, after the administrator audit through the use of apply patch to submit this change.