SVN client-tortoisesvn instructions)

Tortoisesvn is an excellent SVN client tool in windows. By using it, we can visually manage our version libraries. However, because it is only a client, it cannot manage the permissions of the version library.

Tortoisesvn is not an independent window program, but is integrated into the windows context menu for ease of use. Tortoisesvn what does each menu item mean?

01. SVN checkout (SVN fetch) Click SVN checkout. A check box is displayed. In the URL of repository input box, enter the server repository address and the path of local copy, click OK to check out the configuration library on the server.

02. SVN Update (SVN update) if the configuration library has a local copy of work, you only need to execute SVN update to obtain the latest version. Click SVN update. The system will pop up the update prompt box and click OK, update the latest version of the server.

03. Import (import) Select the directory to be submitted to the server, right-click tortoisesvn-import, and enter the server repository address in the URL of repository input box, in the import message input box, enter the import log information and click OK. The file is imported to the server repository.

04. Add (ADD) if multiple files and folders need to be submitted to the server, we can add the files to be submitted to the submit list and perform the submit operation, submit all files at a time. You can select the file to be submitted and click Submit (SVN commit) to submit all files to the server at a time.

05. Resolving Conflicts (conflict resolution) Sometimes you update files from the archives in conflict. A conflict occurs when both of them modify a part of the file. Conflicts can only be resolved by humans rather than machines. When a conflict occurs, you should open the conflicting file and search for rows starting with <. The conflict part is marked: <FILENAME your changes ====== code merged from repository >>>>>> revision subversion generates three additional files for each conflicting file: filename. ext. the local file before the mine update. Filename. Ext. roldrev: the basic version you modified. The latest version obtained from the archives when filename. Ext. rnewrev is updated. Use the edit conflict command in the shortcut menu to solve the conflict. Then, execute the resolved command from the shortcut menu and send the changes to the archive. Please note that the solution command does not resolve the conflict, but simply deletes the filename. Ext. mineandfilename. Ext. R * file and allows you to deliver it.

06. Check for modifications (check for updates) Click Check for modifications. The system list is the status of the files and folders to be updated.

07. view the branch and version structure of the file in revision graph. You can click revision graph to display the version branch in a graphical form.

08. Rename: SVN supports renaming files. Click rename. The file name input box is displayed. enter a new file name, click OK, and submit the modification.

09. delete SVN supports file deletion, which is simple and convenient. Select the file to be deleted, click Delete, and submit the deletion operation to the server.

10. Move: select the files and folders to be moved. Right-click and drag the right-drag file (folder) to a new place in the trace copy; select move files in Subversion to here

11. Revert (Restore) restore operation. If you have deleted the file just now, restore it back. Click Delete and then click Submit. The above prompt box appears, click "delete" and then click "revert" to undo the delete operation. If you click "Submit" at this time, the system prompts that no files have been modified or added and cannot be submitted.

12. Branch/Tag (branch/Tag) when you need to create a branch, click branch/Tag. In the prompt box that appears, enter the Branch file name, log information, and click OK, the Branch is created successfully, and you can view the version and branch status of the file.

13. After the switch file creates a branch, you can choose to work in the trunk or branch. In this case, you can switch through the switch.

14. Merge the main and branch versions of merge. in the path of the source and target input files, select the version number and click confirm. The system merges the files. If there is a conflict, see conflict resolution.

15. Export (export) copies the entire job and exports it to the local directory. The exported file does not contain the svn file mark, and the file and folder do not have the green "√" symbol mark.

16. Relocate when the file library directory on the server has changed, we can relocate the work copy and enter a new address in the to URL input box.

17. Add to ignore list (add to ignore list) Most projects have some files (folders) that do not require version control, such as *. OBJ, *. lst, and so on. Every time the file is sent, tortoisesvn prompts that the files do not need to be controlled, which is annoying. In this case, you can add these files to the ignore list.

18. SVN other functions client Change User Password: Open the browser, enter http: // 192.168.1.250/cgi-bin/changepasswd in the address bar, and start the client to change the User Password interface, enter the correct username, old password, and new password (note that the number of digits of the password should not be less than 6. Try to use a safe password). Click "modify.

19. SVN commit (version submission) submits the modifications made by copying jobs to the version library, so that you can see your modifications when you get the latest version (update.

20. Show log displays all the modification history of the current file (folder. SVN supports file and folder independent version tracing.

21. Check the current version library in repo-browser (view the current version library). This is the portal for tortoisesvn to view the version library. With this menu item, we can access the resource manager of the configuration library, then you can manage the folders in the configuration library, which is equivalent to opening my computer for file management.

22. view the revision history graph of the current project or file. If the project is relatively large, multiple branches will be created and multiple milestones (stable version release) will be created. Here, 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, it cannot be merged automatically. When you submit the modification, tortoisesvn will prompt you that there is a conflict. In this case, you can use this menu item to resolve the conflict. There are two types of conflict resolution: one is to retain a copy, for example, overwrite the current work copy using the configuration library, or vice versa. Another method is to manually resolve conflicts. For text files, you can use the tool that comes with tortoisesvn to list conflicts. Then you can discuss how to solve these conflicts with the submitter. At the same time, it also has good support for word

24. Update to revision (updated to version) Obtain a previous version from the version library. This function is mainly used to view historical versions, rather than roll back versions. Note: It is not recommended to perform any operations on this file after obtaining it. If you have modified the file, SVN will prompt you when you submit the file. The current version is invalid (not the latest version) and cannot be submitted. You need to update the file first. In this way, your modifications are in vain.

25. Revert (rollback) If you make some modifications to the work copy, but you do not want it anymore, you can use this option to cancel the modification.

26. Cleanup (cleanup status) If there is any problem with the current work copy, you can use this option to correct it. For example, some files are version controlled, but you can directly delete them without using tortoisesvn, but tortoisesvn retains the original information (each folder has. SVN hidden folder stores the version information of all the folders in the current folder. Cleanup can be used to clean up.

27. getlock/releaselock (Lock/unlock) If you do not want others to modify a file, you can lock the file to ensure that only you have the permission to modify the file. No modification can be submitted to the configuration library unless you release the lock.

28. Branch/Tag (branch/label) branch indicates a branch. For example, when designing one thing, different people have different implementations, but they have not been tested by practice. No one wants to directly overwrite the design of others, therefore, different branches can be introduced. You can merge these branches if necessary in the future.

Tag indicates a tag. When a project is developed to a certain extent and can run stably, you can tag it as a stable version. You can easily find a specific version in the future (of course, we can also use the version number to search for it, but the number is inconvenient after all) SVN uses hard links like Linux for branches and labels (the same file may exist in two places. Deleting one will not affect the other, and modifications will affect the other ), instead of simply copying a copy of a file, there is no waste of storage space.

29. Export (export) is convenient for deployment. When we need to release a stable version, we can use this function 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 required when our version library is transferred. For example, my original version library was built on a USB flash drive and is now transferred to the Development Server (copying the entire configuration library folder) to use HTTPS instead of accessing the file system. Therefore, you need to relocate the target version library of the original copy to the development server.

31. Create Patch: Create a patch. If the Administrator does not want anyone to submit any changes, but must review the changes, others can create patches to modify the information (patch files) send it to the Administrator. After the Administrator approves the modification, he can use apply patch to submit the modification.

32. Diff (compared to the modified part) If you modify a file and you are not sure about the changes, you can right-click the file and select diff to view it, difference from the latest version on the server

Http://www.douban.com/note/58107006/

 

SVN client-tortoisesvn instructions)