Use of SVN

Basic concepts of 1.Subversion:

Repository (file Warehouse) workcopy (working copy) Checkout (remove) commit (COMMIT) update (update) Revision (revision) tag (tag) Branch (branch) Conflict (conflict) 2. Subversion Basic operations: Create a file repository on the server side remove code from SVN file Library add local file to file repository delete file/directory rename commit modified file update local file compare different versions of file Create label Create branch view version Branch Figure 3. The status meaning of each letter in SVN:"": No Modification "A": Add, added "C": Conflict, Conflict "D": Delete, delete "M": Modify, Local has modified "G": Modify and merged, local file modification and merging with the server "U": Update, Update "R" from the server: replace, replace "I" from the server: ignored, ignore "X": not included in version control, but used by external definition "?" : not included in version control "!": The item has been lost (deleted by a non-SVN command) or incomplete "~": the project under version control has the same name as other types of items

4.SVN command:

<1, checkout files to a local directory
SVN checkout Path (path is a directory on the server)
Example: SVN checkout Svn://192.168.1.1/pro/domain
Shorthand: SVN Co

<2, adding a new file to a repository
SVN Add File
Example: SVN add test.php (add test.php)
SVN add *.php (Add all php files in the current directory)

<3, committing 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 unlock PATH

<5, update to a version
SVN update-r m 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 of the conflict, you need to update, modify the file, then clear the SVN resolved, and then commit the commit)
Shorthand: SVN up

<6, view file or directory status
1) SVN status path (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-v path (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, deleting files
SVN delete path-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, viewing logs
SVN log path
For example: SVN log test.php shows all changes to this file, and its version number

<9, viewing file details
SVN info Path
Example: SVN info test.php

<10, comparative differences
SVN diff path (compares the modified file to the base 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, merging differences between two versions into the current file
SVN merge-r m: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

List of files and directories under <13 and repository
SVN list Path
Displays all files and directories belonging to the repository under the path directory
Shorthand: SVN ls

<14, creating 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 to the new schedule for the next commit.

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, restoring 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 does not restore the deleted directory

<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 to map to a new URL that behaves like SVN update and merges the file on the server with the local file. This is the method that corresponds a working copy to a branch or tag in the same warehouse. 2, rewrite the working copy of the URL metadata to reflect the simple URL changes. When the repository's root URL changes (such as scheme name or hostname change), but the working copy is still mapped to the same directory as the same repository, use this command to update the corresponding relationship 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, outputs 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)

Use of SVN