Chapter three: SVN- operation of the document

add files

Add in the working copy checked out a Readme text file, this time the text file will appear as no version control state, as shown:

At this time, you need to tell TortoiseSVN your operation, as shown:

After joining, your file will turn this state, as shown:

This time using TortoiseSVN commit so other people can see you do change, as shown.

 

Modify the file

Using TortoiseSVN update, Readme file in your working copy, adding "readme", then save, you will find the icon file Readme.txt has changed, as shown: 

The red exclamation mark on behalf of this file is changed, this time to commit the changes, others can see your changes.

Rename the file

Using TortoiseSVN update, rename the Readme file in the working copy is "Readme1 ', then save, you will find the icon Readme file has changed, as shown:

 

File and add a sense, this time you need to tell your operating TortoiseSVN [to join, and then submit], as shown:

 

 

After the addition, submission, this time Readme file in the repository will be renamed to "Readme1"

Delete Files

Using TortoiseSVN update, using TortoiseSVN to delete the Readme file in the working copy and then submit the corresponding file in the repository is deleted out as:

 

Forced to write a comment

 In order to more clearly you can see why you do after every change, you should write each time to submit comments, and as detailed in Figure:

However, because some people may feel too cumbersome, and not fill out the comment, which is not conducive to future version control, you can be forced to submit written comments at the time, first right-click, select TortoiseSVN-> attributes, as:

 

 

In the dialog box, click New -> log size, set the minimum number of characters commit log and locking logs minimum number of characters to 20, submit the text box to display the sideline character position is set to 100, and the check applied recursively properties, click OK, as shown:

  

Submitted, resubmitted later time, if the comment input is less than 20 characters will not be submitted.

 

Conflict Resolution

 冲突问题是最常见的问题,它是这样产生的,A用户check out了一个工作副本A,接着B用户又check out了一个工作副本B.然后A用户对副本A中的文件C做了修改(可以是内容修改,文件删除,重命名,以及位置移动),并且提交.这时候B用户也对文件C的相同部分做了修改,这时候如果B用户进行提交,会先被告知版本过时,要求更新,然后更新的时候会提示冲突了,这时候可以用冲突编辑器进行手动选择.

 

Guess you like

Origin www.cnblogs.com/l75790/p/10947749.html