Use Subversion (SVN)

The typical subversion work cycle is as follows:

 

Update your work copy

 

SVN update

 

Make changes

 

SVN add

 

SVN Delete

 

SVN copy

 

SVN move

 

Verify Modification

 

SVN status

 

SVN diff

 

Some modifications may be canceled.

 

SVN revert

 

Resolve Conflicts (merge others' modifications)

 

SVN update

 

SVN resolved

 

Submit your modifications

 

SVN commit

 

Http://www.uml.org.cn/pzgl/2009032010.asp

Http://www.yuanma.org/data/2009/0401/article_3598.htm

Http://www.subversion.org.cn/svnbook/1.4/index.html

Conclusion: You need to update the commit once, so that the latest modification of the commit can be merged!

(The local version and the latest version in the version library will be checked during commit. Only the same version can be successful !!)

In most cases, merge fails. If the latest version of the file overlaps with your modifications, a conflict arises,

For each conflicting file, subversion places three additional unversionized files to your work copy:

LFilename. Mine

The file you updated does not have a conflict sign, but it is the latest change. (If the Subversion deems that the file cannot be merged,. MineThe file is not created because it is the same as the working file .)

LFilename. roldrev

This is the base version file before your update operation, that is, the version you did not change after the last update.

LFilename. rnewrev

This is the version that your subversion client has just received from the server. This file corresponds to the head version of the version library. Here, oldrev is yours.. SVNThe revision version in the directory. newrev is the version number of the head in the version library.

However, for Binary formats, such as art or sound, it is necessary for users to take turns modifying files in this case because their merging usually fails. Although subversion has always been primarily a copy-Modify-merge system, it also realizes the need to lock some files and provides this locking mechanism (not offline ).

Once you have resolved the conflict, you need to run the svn resolved command to let subversion know!

The revert is an offline operation.. SVNDirectory "original" Copy, restore the file to the unmodified state!