Go SVN server Setup and use (iii)

SVN server Setup and use (iii)

Original: http://www.cnblogs.com/xiaobaihome/archive/2012/03/20/2408089.html

Next, try TortoiseSVN to modify files, add files, delete files, and how to resolve conflicts.

Add File

Add a Readme.txt text file to the checked-out working copy, and the text file will appear as having no version control status:

At this point, you need to inform TORTOISESVN of your operation:

After joining, your file will become this state:

This is the time to commit using TORTOISESVN. So that others can see the changes you have made.

Modify a file

Using the TORTOISESVN update, modifying the Readme.txt file in the working copy, adding "Hello world!", and then saving, you will find that the Readme.txt file icon has changed:

This red exclamation mark indicates that the file has been modified, and when you commit the change, the other person can see your changes.

Renaming files

Using the TORTOISESVN update, rename the working copy of the Readme.txt file to "Readme1.txt", and then save, you will find the Readme.txt file icon has changed:

Add a file more reason, this time you need to tell TortoiseSVN your operation:

After joining, commit, this time the Readme.txt file in the repository will be renamed to "Readme1.txt".

deleting files

Using the TORTOISESVN update, using TORTOISESVN to delete the Readme.txt file from the working copy and submit it, the corresponding file in the repository is deleted:

Force Write comments

In order for you to see more clearly the reasons for each change you make, you should write a comment on each submission and try to be as detailed as possible.:

However, there may be some people because it is too cumbersome to fill in the comments, this is not conducive to later version control, you can force to write comments at the time of submission, first right click, select the Tortoisesvn-> property:

In the popup dialog box, click New log size, set the minimum number of characters for the commit log and the minimum number of characters to lock the log to 20, the character position of the display edge in the submit text box to 100, click OK:

Commit, and submit again later, if the input comment is less than 20 characters, it will not be able to be submitted.

Conflict resolution

The problem of conflict is the most common problem, it is generated, a user check out a working copy of a, and then the B user check out a working copy B. Then a user modifies the file C in copy a (which can be content modification, file deletion, renaming, and location movement). and submit. At this time B user also to file C of the same part of the changes, at this point if the B user commits, will be informed that the version is outdated, ask for updates, and then updated when the conflict will be prompted by the conflict editor can be manually selected.

Go SVN server Setup and use (iii)