[SVN] svn is used under Linux (SVN command line) Ubuntu Delete added Add commit status query recovery

Reprinted from: http://www.cnblogs.com/xulb597/archive/2012/07/18/2597311.html

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/.

Add parameter--reintegrate from branch and to trunk

SVN merge--reintegrate Branch Trunk

SVN ci-m Submit

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. checkout files to a local directory

SVN CheckoutPath (path is a directory on the server)
For example: SVN checkout svn://192.168. 1.1/pro/domain
Shorthand: SVN Co

2 . Add a new file to the repository

SVN St View Status

SVN AddFile
Example: SVN add test.php (add test.php)
SVN add *. PHP (add all the PHP files in the current directory)

3 . Submit the changed files to the repository

SVN commit -M "LogMessage" [-n] [--no-unlock] PATH (use--no-unlock switch if hold lock is selected)
Example: SVN commit-m "Add test file for my test" test.php
Shorthand: svn ci

4. Locking/unlock

SVN lock-M "Lockmessage" [--force] PATH
Example: SVN lock-m "lock test File" test.php
svn unlockPATH

5. Update to a version

SVN update-rM path
For example:
SVN update If there is no directory behind it, the default is to update all files in the current directory and subdirectories to the latest version.
SVN update-r test.php (Restore the file test.php in the repository to version 200)
SVN update test.php (updated, sync in Repository.) If the prompt expires at the time of submission, it is because conflicting, need to update, modify the file, and then clear SVN resolved, and submit a commit at the end)
Shorthand: SVN up

6. view file or directory status

1) SVN statusPath (Status of files and subdirectories under directory, normal status not shown)
"?: not in SVN control; M: Content modified; C: conflict; A: Scheduled to be added to Repository; K: Locked"
2) SVN status-vPath (show file and subdirectory status)
The first column remains the same, the second column shows the work version number, and the third and fourth columns show the last modified version number and the modified person.
Note: The SVN status, SVN diff, and SVN revert three commands can be executed without a network, because SVN retains the original copy of the local version in. svn.
Shorthand: SVN St

7. Delete Files

SVN DeletePath-m "Delete Test Fle"
Example: SVN delete svn://192.168.1.1/pro/domain/test.php-m "Delete test file"
Or go directly to svn delete test.php and then svn ci-m ' delete test file ', which we recommend using this
Shorthand: SVN (del, remove, RM)

8. View Logs

SVN logPath
For example: SVN log test.php shows all changes to this file, and its version number

9. View File Details

SVN infoPath
Example: SVN info test.php

10. Compare Differences

SVN diffPath (compares the modified file to the underlying version)
Example: SVN diff test.php
SVN diff-R m:n Path (difference between version m and version N)
Example: SVN diff-r 200:201 test.php
Shorthand: SVN di

11 . Merge the differences between the two versions into the current file

SVN merge-rM:n Path
For example: SVN merge-r 200:205 test.php (the difference between version 200 and 205 is merged into the current file, but generally conflicts occur and need to be addressed)

12. SVN Help

SVN Help
SVN help CI

------------------------------------------------------------------------------

The above is a common command, the following write a few common

------------------------------------------------------------------------------

13 . List of files and directories under the repository

SVN listPath
Displays all files and directories belonging to the repository under the path directory
Shorthand: SVN ls

14 . Create a new directory under version control

svn mkdir : Create a new directory under the included version control.
Usage: 1, mkdir PATH ...
2. mkdir URL ...
Create a version-controlled directory.
1. Each directory specified in the working copy PATH will be created on the local side and added
Scheduled to be submitted for the next time.
2. Each directory specified in the URL will be created by submitting it to the repository immediately.
In both cases, all intermediate directories must exist beforehand.

15. Restore Local modifications

svn revert : Restores the original unchanged working copy file (restores most of the local modifications). Revert
Usage: revert PATH ...
Note: The notebook command will not access the network and will release the conflicting condition. But it won't recover.
Directories that were deleted

16. Code Base URL Change

SVN switch (SW): updates the working copy to a different URL.
Usage: 1, switch URL [PATH]
2. Switch--relocate from to [PATH ...]

1, update your working copy, map to a new URL, its behavior is similar to "SVN update", will also
The files on the server are merged with the local files. This is the one where the working copy corresponds to a branch or tag in the same warehouse.
Method.
2, rewrite the working copy of the URL metadata to reflect the simple URL changes. When the root URL of the warehouse changes
(such as scheme name or host name change), but the working copy is still used when mapping to the same directory in the same warehouse
This command updates the correspondence between the working copy and the warehouse.

17. Conflict Resolution

SVN resolved: removes the "conflicting" status of the working Copy's directory or file.
Usage: Resolved PATH ...
Note: The book command does not resolve the conflict by syntax or remove the conflict token; it simply removes the conflicting
File, and then allow PATH to submit again.

18 . Output the contents of the specified file or URL.

SVN cat Target [@ VERSION] ... If a version is specified, the lookup starts 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 can be submitted)

[SVN] svn is used under Linux (SVN command line) Ubuntu Delete added Add commit status query recovery