Next, try using TortoiseSVN to modify files, add files, delete files, and how to resolve conflicts, etc.
add files
Add a Readme.txt text file to the checked out working copy, at this time the text file will be displayed as no version control state, as shown in the figure:
At this time, you need to inform TortoiseSVN about your operation, as shown in the figure:
After joining, your file will become this state, as shown in the figure:
At this time, use TortoiseSVN to submit. So others can see your changes, as shown in the figure.
Modify the file
Use TortoiseSVN to update, modify the Readme.txt file in the working copy, add "hello world!", and then save, you will find that the icon of the Readme.txt file has changed, as shown in the figure:
This red exclamation mark means that the file has been modified. At this time, submit the changes, and others can see your changes.
rename file
Use TortoiseSVN to update, rename the Readme.txt file in the working copy to "Readme1.txt", then save it, you will find that the icon of the Readme.txt file has changed, as shown in the figure:
It is more reasonable to add files. At this time, you need to tell TortoiseSVN your operation, as shown in the figure:
After adding, submit, the Readme.txt file in the repository will be renamed to "Readme1.txt" at this time.
Delete Files
Use TortoiseSVN to update, use TortoiseSVN to delete the Readme.txt file in the working copy, and then submit, the corresponding file in the repository is deleted, as shown in the figure:
Mandatory to write comments
In order for you to be able to see the reasons for each change you made more clearly in the future, you should write a comment when you submit each time, and be as detailed as possible. As shown in the figure:
However, some people may not fill in comments because they think it is too cumbersome, which is not conducive to future version control. You can force to write comments when submitting. First, right-click and select TortoiseSVN->Properties, as shown in the figure:
In the pop-up dialog box, click New -> Log Size, set the minimum number of characters for the submission log and the minimum number of characters for the locked log to 20, and set the character position of the border displayed in the submission text box to 100, and click OK, as shown in the figure:
提交,以后再次提交的时候,如果输入的注释少于20个字符,将无法提交.
冲突解决
冲突问题是最常见的问题,它是这样产生的,A用户check out了一个工作副本A,接着B用户又check out了一个工作副本B.然后A用户对副本A中的文件C做了修改(可以是内容修改,文件删除,重命名,以及位置移动),并且提交.这时候B用户也对文件C的相同部分做了修改,这时候如果B用户进行提交,会先被告知版本过时,要求更新,然后更新的时候会提示冲突了,这时候可以用冲突编辑器进行手动选择.