Merge steps: (1) switch to the branch first; (2) SVN merge trunk. (3) svn sw trunk (4) SVN merge -- ReIntegrate branch.
SVN merge http: // 59.251.189.152: 8989/SVN/Ron/trunk /.
The parameter -- reintegrate must be added to the branch and trunk
SVN merge -- reintegrate branch trunk
SVN ci-M submission
New Branch: svn cp http: // 59.251.189.152: 8989/SVN/Ron/trunk http: // 59.251.189.152: 8989/SVN/Ron/branches/branch1.2.68 _ renrendai
1,Run the file checkout to the local directory.
SVN checkoutPATH (path is the directory on the server)
For example: SVN checkout SVN: // 192.168 . 1.1 / Pro / Domain
Abbreviation: SVN Co
2,Add new files to the version Library
SVN st view status
SVN
Add File
Example: SVN Add Test. php (add test. php)
SVN Add * . Php (add all PHP files in the current directory)
3,Submit the modified file to the version library.
SVN commit-M" Logmessage " [ -N ] [ -- No-Unlock ] PATH (if you choose to keep the lock, use the -- no-Unlock switch)
Example: SVN commit-m" Add test file for my test " Test. php
Abbreviation: SVN Ci
4,Lock/unlock
SVN lock-M " Lockmessage " [ -- Force ] Path
Example: SVN lock-m " Lock Test File " Test. php
SVN unlockPath
5,Update to a specific version
SVN Update-RM path
For example:
If there is no directory after SVN update, all files in the current directory and sub-directories are updated to the latest version by default.
SVN Update-R 200 Test. php (restore the file test. php In the version library to version 200)
SVN update test. php (updated for version library synchronization. If an expiration prompt is prompted during submission, it is because
Conflict. Update the file first.And then clear
SVN resolved, And then submit commit)
Abbreviation: SVN up
6,View the file or directory status
1 )
SVN statusPATH (the State of the files and subdirectories under the directory, the normal state is not displayed)
【? : Not under SVN control; M: The content is modified; C: A conflict occurs; A: It is scheduled to be added to the version Library; K: it is locked]
2 )
SVN status-VPATH (display file and subdirectory status)
The first column remains the same, the second column displays the working version number, and the third and fourth columns show the last modified version number and modifier.
Note: SVN status, SVN diff, and SVN revert commands can be executed without a network, because SVN is locally deployed. SVN retains the original copy of the local version.
Abbreviation: SVN St
7,Delete an object
SVN DeletePath-m " Delete test FLE "
Example: SVN delete SVN :// 192.168.1.1 /Pro/domain/test. php-m " Delete Test File "
Or directly delete SVN test. php and then SVN ci-M 'delete test file'. We recommend that you use this
Abbreviation: SVN (Del, remove, RM)
8,View logs
SVN logPath
For example, SVN Log Test. php displays all the modification records of this file and changes to its version number.
9,View File details
SVN infoPath
Example: SVN info test. php
10,Comparison
SVN diffPATH (compare the modified file with the basic version)
Example: SVN diff test. php
SVN diff-R m: N path (differences between version m and version n)
Example: SVN diff-r 200:201 test. php
Abbreviation: SVN di
11,Merge the differences between the two versions into the current file
SVN merge-RM: N path
Example: SVN merge-R 200 : 205 Test. php (merge the differences between version 200 and version 205 to the current file, but there are usually conflicts. You need to handle them)
12,SVN help
SVN help
SVN help Ci
------------------------------------------------------------------------------
The above are common commands. Below are a few
------------------------------------------------------------------------------
13,List of files and directories in the version Library
SVN listPath
Displays all files and directories in the path directory that belong to the version library.
Abbreviation: SVN ls
14,Create a new directory under Version Control
SVN mkdir: Create a new directory under version control.
Usage: 1. mkdir path...
2. mkdir URL...
Create a version control directory.
1. Each directory specified by the working copy path will be created on the local end and added to the new
Scheduling to wait for the next submission.
2. Each directory specified with a URL is created by submitting it to the repository immediately.
In both cases, all the intermediate directories must exist in advance.
15,Restore local modification
SVN revert: Restore the original unchanged working copy file (recover most local modifications ). Revert:
Usage: Revert path...
Note: The sub-commands do not access the network and will release the conflict. But it won't be restored.
Deleted directory
16, CodeLibrary URL change
SVN switch (SW ):Update the working copy to different URLs.
Usage: 1. Switch URL [path]
2. Switch -- relocate from to [path...]
1. Update your work copy and map it to a new URL. The behavior is similar to "SVN Update" and
Merge files on the server with local files. This maps the work copy to a branch or tag in the same warehouse.
Method.
2. Rewrite the URL metadata of the working copy to reflect the changes on the simple URL. When the root URL of the Repository changes
(For example, the solution name or host name change), but the working copy is still mapped to the same directory in the same repository.
This command updates the correspondence between the working copy and the warehouse.
17,Resolve Conflicts
SVN resolved:Remove the "Conflict" Status of the directory or file of the working copy.
Usage: resolved path...
Note: subcommands do not follow the syntax to resolve conflicts or remove conflicting tags. They only remove conflicting tags.
Related files, and then allow the path to be submitted again.
18,Output the content of the specified file or URL.
SVNCatIf the target [@ version]... is specified, it is searched from the specified version.
SVN cat-r Prev FILENAME> filename (prev is the previous version, you can also write a specific version number, so that the output result can be submitted)