Subversion client operation procedure

Subversion client operation procedure

 

Client operation steps

1. Install tortoisesvn

Install tortoisesvn-1.4.0.7501-win32-svn-1.4.0.msi

2. Create a directory on the local client and right-click check out.

Enter the server repository address in the address bar, for example, http: // 172.24.3.175/SVN/test/

 

3 add: Add a file

1) Right-click the corresponding file in the local folder and execute add

2) Right-click to execute SVN commit

3) if a file with the same name already exists in the corresponding path on the server, the file cannot be commit. The file must be removed from the project management and deleted or renamed in the folder. Otherwise, the project cannot be updated.

 

4. File Modification Process

1) create a local working environment and check out to get the project

2) use ultraedit to open the file to be modified and save it.

Note: If you can confirm that the file has not been modified on the local machine before, you can run update here. SVN will update the latest version on the server to overwrite the version on the local machine, no file conflict is displayed. If you want to view the original file that was overwritten Before update, You need to execute diff.

3) Right-click to execute SVN update. The system displays the code conflict and version number,

 

Open the modified file and you will see that SVN automatically merges the server version with the local machine version, and marks the differences

Note: Do not directly edit and modify automatically merged files. Otherwise, SVN management will be messy!

 

4) Right-click Edit conflicts to solve the version conflict.

Note:

(1) theirs is the latest version on the server, and the version number is rxx,

(2) The upper right part is the local machine version.

(3) The lower part is divided into the conflict editing area. +-indicates the deleted or newly added file. unresolvedconflict! Part is the code conflict part. Right-click "unresolvedconflict !" You can select a server or local version for the cursor. If you have any questions about the color, choose View> Settings> color to view the description.

 

Note: This tool does not have the Undo function. You must note that

 

(4) Save the disk after editing. Use ue to view the source file. You can see that the file's modifier has been removed automatically.

 

5) execute SVN commit

In this case, the file can be submitted.

 

5, diff

Right-click diff and compare the version before and after local modification, regardless of the server version.

 

 

Appendix:

TIPS:

1. In tortoisesvn, show whitespace does not display UNIX Characters During comparison and editing.

2, in maruo, other-> edit user-menu-> file-> binary enable binary mode