SVN - - help
svn 子命令众多，常用者不过几个。
add: 把文件和目录纳入版本控制，通过调度加到版本库。它们会在下一次提交时加入。
用法: add 路径...
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--force : 强制操作运行
--no-ignore : disregard default and svn:ignore and
svn:global-ignores property ignores
--auto-props : 启用自动属性
--no-auto-props : 关闭自动属性
--parents : 增加中间父目录
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
auth: Manage cached authentication credentials.
usage: 1. svn auth [PATTERN ...]
usage: 2. svn auth --remove PATTERN [PATTERN ...]
With no arguments, list all cached authentication credentials.
Authentication credentials include usernames, passwords,
SSL certificates, and SSL client-certificate passphrases.
If PATTERN is specified, only list credentials with attributes matching one
or more patterns. With the --remove option, remove cached authentication
credentials matching one or more patterns.
If more than one pattern is specified credentials are considered only they
match all specified patterns. Patterns are matched case-sensitively and may
contain glob wildcards:
? matches any single character
* matches a sequence of arbitrary characters
[abc] matches any of the characters listed inside the brackets
Note that wildcards will usually need to be quoted or escaped on the
command line because many command shells will interfere by trying to
expand them.
有效选项:
--remove : remove matching authentication credentials
--show-passwords : show cached passwords
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
blame (praise, annotate, ann): Show when each line of a file was last (or
next) changed.
usage: blame [-rM:N] TARGET[@REV]...
Annotate each line of a file with the revision number and author of the
last change (or optionally the next change) to that line.
With no revision range (same as -r0:REV), or with '-r M:N' where M < N,
annotate each line that is present in revision N of the file, with
the last revision at or before rN that changed or added the line,
looking back no further than rM.
With a reverse revision range '-r M:N' where M > N,
annotate each line that is present in revision N of the file, with
the next revision after rN that changed or deleted the line,
looking forward no further than rM.
If specified, REV determines in which revision the target is first
looked up.
Write the annotated result to standard output.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-v [--verbose] : 打印附加信息
-g [--use-merge-history] : 从合并历史使用/显示额外信息
--incremental : 给予适合串联的输出
--xml : 输出为 XML
-x [--extensions] ARG : Specify differencing options for external diff or
internal diff or blame. Default: '-u'. Options are
separated by spaces. Internal diff and blame take:
-u, --unified: Show 3 lines of unified context
-b, --ignore-space-change: Ignore changes in
amount of white space
-w, --ignore-all-space: Ignore all white space
--ignore-eol-style: Ignore changes in EOL style
-U ARG, --context ARG: Show ARG lines of context
-p, --show-c-function: Show C function name
--force : 强制操作运行
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
cat: 输出指定文件或URL的内容。
用法: cat 目标[@版本]...
如果指定了版本，将从指定的版本开始查找。
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
--ignore-keywords : 不要展开关键字
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
changelist (cl): 耦合(或解耦)命名文件与修改列表 CLNAME。
使用: 1. changelist CLNAME PATH...
2. changelist --remove PATH...
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--remove : 删除修改列表耦合
--targets ARG : 传递文件 ARG 内容为附件参数
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
checkout (co): 从版本库签出工作副本。
使用: checkout URL[@REV]... [PATH]
如果指定 REV，那么它确定了从 URL 首先查找的版本。
如果省略路径参数，则 URL 最末尾的目录名作为目标目录名。如果指定多个 URL，
则依次将其签出到 PATH 的子目录中，子目录名就是 URL 最末尾的目录名。
如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动导
致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它将成
为受版本控制的路径，但是内容不改变。它意味着障碍路径的孩子，如果也是障碍路
径，那么也会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，将视为工
作副本发生本地修改。版本库中的所有属性都应用于障碍路径。
参见 “svn help update” 以获取报告执行动作的字符列表。
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : 不打印信息，或只打印概要信息
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--force : 强制操作运行
--ignore-externals : 忽略外部项目
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
cleanup: Recursively clean up the working copy, removing write locks, resuming
unfinished operations, etc.
usage: cleanup [WCPATH...]
By default, finish any unfinished business in the working copy at WCPATH,
and remove write locks (shown as 'L' by the 'svn status' command) from
the working copy. Usually, this is only necessary if a Subversion client
has crashed while using the working copy, leaving it in an unusable state.
WARNING: There is no mechanism that will protect write locks still
being used by other Subversion clients. Running this command
while another client is using the working copy can corrupt
the working copy beyond repair!
If the --remove-unversioned option or the --remove-ignored option
is given, remove any unversioned or ignored items within WCPATH.
To prevent accidental working copy corruption, unversioned or ignored
items can only be removed if the working copy is not already locked
for writing by another Subversion client.
Note that the 'svn status' command shows unversioned items as '?',
and ignored items as 'I' if the --no-ignore option is given to it.
有效选项:
--diff3-cmd ARG : 使用 ARG 作为合并命令
--remove-unversioned : remove unversioned items
--remove-ignored : remove ignored items
--include-externals : also operate on externals defined by
svn:externals properties
-q [--quiet] : 不打印信息，或只打印概要信息
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
commit (ci): Send changes from your working copy to the repository.
usage: commit [PATH...]
A log message must be provided, but it can be empty. If it is not
given by a --message or --file option, an editor will be started.
If any targets are (or contain) locked items, those will be
unlocked after a successful commit.
If --include-externals is given, also commit file and directory
externals reached by recursion. Do not commit externals with a
fixed revision.
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--targets ARG : 传递文件 ARG 内容为附件参数
--no-unlock : 不要解锁目标
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--keep-changelists : 不要在提交后删除修改列表
--include-externals : also operate on externals defined by
svn:externals properties
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
copy (cp): Copy files and directories in a working copy or repository.
usage: copy SRC[@REV]... DST
SRC and DST can each be either a working copy (WC) path or URL:
WC -> WC: copy and schedule for addition (with history)
WC -> URL: immediately commit a copy of WC to URL
URL -> WC: check out URL into WC, schedule for addition
URL -> URL: complete server-side copy; used to branch and tag
All the SRCs must be of the same type. When copying multiple sources,
they will be added as children of DST, which must be a directory.
WARNING: For compatibility with previous versions of Subversion,
copies performed using two working copy paths (WC -> WC) will not
contact the repository. As such, they may not, by default, be able
to propagate merge tracking information from the source of the copy
to the destination.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : 不打印信息，或只打印概要信息
--ignore-externals : 忽略外部项目
--parents : 创建中间目录
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
--pin-externals : pin externals with no explicit revision to their
current revision (recommended when tagging)
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
delete (del, remove, rm): 从版本库中删除文件和目录。
用法: 1、delete PATH...
2、delete URL...
1、每个 PATH 指定的项目会被调度到下次提交时从版本库删除。除非给出
--keep-local 参数，工作副本中没有提交的文件和目录会被立即删除。
如果 PATH 未版本控制或者包含未版本控制的项目，或者包含已修改的
项目，那么仅当给出 --force 或 --keep-local 参数时这些项目才会被
删除。
2、每个 URL 指定的项目会通过立即提交从版本库中删除。
有效选项:
--force : 强制操作运行
-q [--quiet] : 不打印信息，或只打印概要信息
--targets ARG : 传递文件 ARG 内容为附件参数
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
--keep-local : 在工作副本中保留路径
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
diff (di): Display local changes or differences between two revisions or paths.
usage: 1. diff
2. diff [-c M | -r N[:M]] [TARGET[@REV]...]
3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \
[PATH...]
4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]
5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]
6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]
1. Use just 'svn diff' to display local modifications in a working copy.
2. Display the changes made to TARGETs as they are seen in REV between
two revisions. TARGETs may be all working copy paths or all URLs.
If TARGETs are working copy paths, N defaults to BASE and M to the
working copy; if URLs, N must be specified and M defaults to HEAD.
The '-c M' option is equivalent to '-r N:M' where N = M-1.
Using '-c -M' does the reverse: '-r M:N' where N = M-1.
3. Display the differences between OLD-TGT as it was seen in OLDREV and
NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to
OLD-TGT and NEW-TGT and restrict the output to differences for those
paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].
NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default
to N, -r N:M makes OLDREV default to N and NEWREV default to M.
If OLDREV or NEWREV are not specified, they default to WORKING for
working copy targets and to HEAD for URL targets.
Either or both OLD-TGT and NEW-TGT may also be paths to unversioned
targets. Revisions cannot be specified for unversioned targets.
Both targets must be of the same node kind (file or directory).
Diffing unversioned targets against URL targets is not supported.
4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'
5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'
6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-c [--change] ARG : 版本 ARG (如同 -r ARG-1:ARG) 做的修改
如果 ARG 为负数则等价于 -r ARG:ARG-1 如果 ARG 的格式是 ARG1-ARG2，那么它等价于
ARG1:ARG2，包含 ARG1
--old ARG : 使用 ARG 作为旧目标
--new ARG : 使用 ARG 作为新目标
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--diff-cmd ARG : 使用 ARG 作为比较命令
--internal-diff : 覆盖配置文件中指定的 diff-cmd
-x [--extensions] ARG : Specify differencing options for external diff or
internal diff or blame. Default: '-u'. Options are
separated by spaces. Internal diff and blame take:
-u, --unified: Show 3 lines of unified context
-b, --ignore-space-change: Ignore changes in
amount of white space
-w, --ignore-all-space: Ignore all white space
--ignore-eol-style: Ignore changes in EOL style
-U ARG, --context ARG: Show ARG lines of context
-p, --show-c-function: Show C function name
--no-diff-added : 不要输出增加文件造成的差异
--no-diff-deleted : 不要输出删除文件造成的差异
--ignore-properties : 操作时忽略属性
--properties-only : show only properties during the operation
--show-copies-as-adds : 请不要将复制或移动的文件与其源文件比较
--notice-ancestry : diff unrelated nodes as delete and add
--summarize : 显示结果的概要
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--force : 强制操作运行
--xml : 输出为 XML
--git : 使用 git 的扩展差异格式
--patch-compatible : generate diff suitable for generic third-party
patch tools; currently the same as
--show-copies-as-adds --ignore-properties
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
export: 产生一个无版本控制的目录树副本。
用法: 1、export [-r REV] URL[@PEGREV] [PATH]
2、export [-r REV] PATH1[@PEGREV] [PATH2]
1、从 URL 指定的版本库，导出一个干净的目录树到 PATH。如果有指定
REV 的话，内容即为该版本的，否则就是 HEAD 版本。如果 PATH
被省略的话，URL的最后部分会被用来当成本地的目录名称。
2、在工作副本中，从指定的 PATH1 导出一个干净的目录树到 PATH2。如果
有指定 REV 的话，会从指定的版本导出，否则从工作副本导出。如果
PATH2 被省略的话，PATH1 的最后部分会被用来当成本地的目录名称。
如果没有指定 REV 的话，所有的本地修改都保留，但是未纳入版本控制
的文件不会被复制。
如果指定了 PEGREV ，将从指定的版本本开始查找。
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : 不打印信息，或只打印概要信息
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--force : 强制操作运行
--native-eol ARG : 使用非标准的 EOL 标记
系统中立的文件标记 svn:eol-style 属性取值为 “native”。
ARG 可以是以下之一“LF”，“CR”，“CRLF”
--ignore-externals : 忽略外部项目
--ignore-keywords : 不要展开关键字
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
help (?, h): 描述本程序或其子命令的用法。
用法: help [子命令...]
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
import: 将未纳入版本控制的文件或目录树提交到版本库。
用法: import [PATH] URL
递归地提交 PATH 的副本至 URL。
如果省略 PATH，则默认为 “.”。
父目录会根据需要在版本库内创建。
如果 PATH 是目录，则其下的内容直接加入到 URL 指定的位置内。
如果使用了 “--force”，那么不能纳入版本控制的项目，例如设备文件，管道等，会被忽略。
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--auto-props : 启用自动属性
--force : 强制操作运行
--no-auto-props : 关闭自动属性
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
--no-ignore : disregard default and svn:ignore and
svn:global-ignores property ignores
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
info: Display information about a local or remote item.
usage: info [TARGET[@REV]...]
Print information about each TARGET (default: '.').
TARGET may be either a working-copy path or URL. If specified, REV
determines in which revision the target is first looked up.
With --show-item, print only the value of one item of information
about TARGET. One of the following items can be selected:
kind the kind of TARGET
url the URL of TARGET in the repository
relative-url the repository-relative URL
repos-root-url the repository root URL
repos-uuid the repository UUID
revision the revision of TARGET (defaults to BASE
for working copy paths and HEAD for URLs)
last-changed-revision the most recent revision in which TARGET
was changed
last-changed-date the date of the last-changed revision
last-changed-author the author of the last-changed revision
wc-root the root of TARGET's working copy
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--targets ARG : 传递文件 ARG 内容为附件参数
--incremental : 给予适合串联的输出
--xml : 输出为 XML
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--include-externals : also operate on externals defined by
svn:externals properties
--show-item ARG : print only the item identified by ARG ('kind',
'url', 'relative-url', 'repos-root-url',
'repos-uuid', 'revision', 'last-changed-revision',
'last-changed-date', 'last-changed-author',
'wc-root')
--no-newline : 不输出其后的换行符
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
list (ls): 列出版本库中的目录内容。
用法: list [TARGET[@REV]...]
显示版本库中文件和子目录列表。如果 TARGET 是工作副本路径，那么操作对应的
版本库URL指定的TARGET。REV指定从在哪个版本查找TARGET。
TARGET默认是“.”，表示当前工作目录对应的版本库URL。
使用 --verbose 时，每个条目会显示以下额外信息:
最后一次提交的版本号码
最后一次提交的作者
如果被锁定，显示字母“O”。(使用“svn info URL”查看详细信息)
大小 (以字节为单位)
最后一次提交的日期与时间
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-v [--verbose] : 打印附加信息
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--incremental : 给予适合串联的输出
--xml : 输出为 XML
--include-externals : also operate on externals defined by
svn:externals properties
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
lock: 锁定版本库中的路径，使得其他用户不能向其提交修改。
用法: lock TARGET...
使用 --force 选项可以从其他用户或工作副本窃取到锁。
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
-m [--message] ARG : 指定加锁注释ARG
-F [--file] ARG : 从文件 ARG 读取加锁注释
--force-log : 强制校验锁定注释源
--encoding ARG : 将ARG的值视为字符编码
--force : 强制操作运行
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
log: Show the log messages for a set of revision(s) and/or path(s).
usage: 1. log [PATH][@REV]
2. log URL[@REV] [PATH...]
1. Print the log messages for the URL corresponding to PATH
(default: '.'). If specified, REV is the revision in which the
URL is first looked up, and the default revision range is REV:1.
If REV is not specified, the default revision range is BASE:1,
since the URL might not exist in the HEAD revision.
2. Print the log messages for the PATHs (default: '.') under URL.
If specified, REV is the revision in which the URL is first
looked up, and the default revision range is REV:1; otherwise,
the URL is looked up in HEAD, and the default revision range is
HEAD:1.
Multiple '-c' or '-r' options may be specified (but not a
combination of '-c' and '-r' options), and mixing of forward and
reverse ranges is allowed.
With -v, also print all affected paths with each log message.
With -q, don't print the log message body itself (note that this is
compatible with -v).
Each log message is printed just once, even if more than one of the
affected paths for that revision were explicitly requested. Logs
follow copy history by default. Use --stop-on-copy to disable this
behavior, which can be useful for determining branchpoints.
The --depth option is only valid in combination with the --diff option
and limits the scope of the displayed diff to the specified depth.
If the --search option is used, log messages are displayed only if the
provided search pattern matches any of the author, date, log message
text (unless --quiet is used), or, if the --verbose option is also
provided, a changed path.
The search pattern may include "glob syntax" wildcards:
? matches any single character
* matches a sequence of arbitrary characters
[abc] matches any of the characters listed inside the brackets
If multiple --search options are provided, a log message is shown if
it matches any of the provided search patterns. If the --search-and
option is used, that option's argument is combined with the pattern
from the previous --search or --search-and option, and a log message
is shown only if it matches the combined search pattern.
If --limit is used in combination with --search, --limit restricts the
number of log messages searched, rather than restricting the output
to a particular number of matching log messages.
Examples:
Show the latest 5 log messages for the current working copy
directory and display paths changed in each commit:
svn log -l 5 -v
Show the log for bar.c as of revision 42:
svn log bar.c@42
Show log messages and diffs for each commit to foo.c:
svn log --diff http://www.example.com/repo/project/foo.c
(Because the above command uses a full URL it does not require
a working copy.)
Show log messages for the children foo.c and bar.c of the directory
'/trunk' as it appeared in revision 50, using the ^/ URL shortcut:
svn log ^/trunk@50 foo.c bar.c
Show the log messages for any incoming changes to foo.c during the
next 'svn update':
svn log -r BASE:HEAD foo.c
Show the log message for the revision in which /branches/foo
was created:
svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-c [--change] ARG : 版本 ARG 引起的改变
-q [--quiet] : do not print the log message
-v [--verbose] : also print all affected paths
-g [--use-merge-history] : 从合并历史使用/显示额外信息
--targets ARG : 传递文件 ARG 内容为附件参数
--stop-on-copy : 查看历史不要跨越不同的副本
--incremental : 给予适合串联的输出
--xml : 输出为 XML
-l [--limit] ARG : 日值项最大值
--with-all-revprops : 获取所有版本属性
--with-no-revprops : 没有找回版本属性
--with-revprop ARG : 获取版本属性 ARG
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--diff : 产生差异输出
--diff-cmd ARG : 使用 ARG 作为比较命令
--internal-diff : 覆盖配置文件中指定的 diff-cmd
-x [--extensions] ARG : Specify differencing options for external diff or
internal diff or blame. Default: '-u'. Options are
separated by spaces. Internal diff and blame take:
-u, --unified: Show 3 lines of unified context
-b, --ignore-space-change: Ignore changes in
amount of white space
-w, --ignore-all-space: Ignore all white space
--ignore-eol-style: Ignore changes in EOL style
-U ARG, --context ARG: Show ARG lines of context
-p, --show-c-function: Show C function name
--search ARG : use ARG as search pattern (glob syntax)
--search-and ARG : combine ARG with the previous search pattern
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
merge: Merge changes into a working copy.
usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]
(the 'complete' merge)
2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]
(the 'cherry-pick' merge)
3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]
(the '2-URL' merge)
1. This form, with one source path and no revision range, is called
a 'complete' merge:
svn merge SOURCE[@REV] [TARGET_WCPATH]
The complete merge is used for the 'sync' and 'reintegrate' merges
in the 'feature branch' pattern described below. It finds all the
changes on the source branch that have not already been merged to the
target branch, and merges them into the working copy. Merge tracking
is used to know which changes have already been merged.
SOURCE specifies the branch from where the changes will be pulled, and
TARGET_WCPATH specifies a working copy of the target branch to which
the changes will be applied. Normally SOURCE and TARGET_WCPATH should
each correspond to the root of a branch. (If you want to merge only a
subtree, then the subtree path must be included in both SOURCE and
TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)
SOURCE is usually a URL. The optional '@REV' specifies both the peg
revision of the URL and the latest revision that will be considered
for merging; if REV is not specified, the HEAD revision is assumed. If
SOURCE is a working copy path, the corresponding URL of the path is
used, and the default value of 'REV' is the base revision (usually the
revision last updated to).
TARGET_WCPATH is a working copy path; if omitted, '.' is generally
assumed. There are some special cases:
- If SOURCE is a URL:
- If the basename of the URL and the basename of '.' are the
same, then the differences are applied to '.'. Otherwise,
if a file with the same basename as that of the URL is found
within '.', then the differences are applied to that file.
In all other cases, the target defaults to '.'.
- If SOURCE is a working copy path:
- If the source is a file, then differences are applied to that
file (useful for reverse-merging earlier changes). Otherwise,
if the source is a directory, then the target defaults to '.'.
In normal usage the working copy should be up to date, at a single
revision, with no local modifications and no switched subtrees.
- The 'Feature Branch' Merging Pattern -
In this commonly used work flow, known also as the 'development
branch' pattern, a developer creates a branch and commits a series of
changes that implement a new feature. The developer periodically
merges all the latest changes from the parent branch so as to keep the
development branch up to date with those changes. When the feature is
complete, the developer performs a merge from the feature branch to
the parent branch to re-integrate the changes.
parent --+----------o------o-o-------------o--
\ \ \ /
\ merge merge merge
\ \ \ /
feature +--o-o-------o----o-o----o-------
A merge from the parent branch to the feature branch is called a
'sync' or 'catch-up' merge, and a merge from the feature branch to the
parent branch is called a 'reintegrate' merge.
- Sync Merge Example -
............
. .
trunk --+------------L--------------R------
\ \
\ |
\ v
feature +------------------------o-----
r100 r200
Subversion will locate all the changes on 'trunk' that have not yet
been merged into the 'feature' branch. In this case that is a single
range, r100:200. In the diagram above, L marks the left side (trunk@100)
and R marks the right side (trunk@200) of the merge source. The
difference between L and R will be applied to the target working copy
path. In this case, the working copy is a clean checkout of the entire
'feature' branch.
To perform this sync merge, have a clean working copy of the feature
branch and run the following command in its top-level directory:
svn merge ^/trunk
Note that the merge is now only in your local working copy and still
needs to be committed to the repository so that it can be seen by
others. You can review the changes and you may have to resolve
conflicts before you commit the merge.
- Reintegrate Merge Example -
The feature branch was last synced with trunk up to revision X. So the
difference between trunk@X and feature@HEAD contains the complete set
of changes that implement the feature, and no other changes. These
changes are applied to trunk.
rW rX
trunk ------+--------------------L------------------o
\ . ^
\ ............. /
\ . /
feature +--------------------------------R
In the diagram above, L marks the left side (trunk@X) and R marks the
right side (feature@HEAD) of the merge. The difference between the
left and right side is merged into trunk, the target.
To perform the merge, have a clean working copy of trunk and run the
following command in its top-level directory:
svn merge ^/feature
To prevent unnecessary merge conflicts, a reintegrate merge requires
that TARGET_WCPATH is not a mixed-revision working copy, has no local
modifications, and has no switched subtrees.
A reintegrate merge also requires that the source branch is coherently
synced with the target -- in the above example, this means that all
revisions between the branch point W and the last merged revision X
are merged to the feature branch, so that there are no unmerged
revisions in-between.
2. This form is called a 'cherry-pick' merge:
svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]
A cherry-pick merge is used to merge specific revisions (or revision
ranges) from one branch to another. By default, this uses merge
tracking to automatically skip any revisions that have already been
merged to the target; you can use the --ignore-ancestry option to
disable such skipping.
SOURCE is usually a URL. The optional '@REV' specifies only the peg
revision of the URL and does not affect the merge range; if REV is not
specified, the HEAD revision is assumed. If SOURCE is a working copy
path, the corresponding URL of the path is used, and the default value
of 'REV' is the base revision (usually the revision last updated to).
TARGET_WCPATH is a working copy path; if omitted, '.' is generally
assumed. The special cases noted above in the 'complete' merge form
also apply here.
The revision ranges to be merged are specified by the '-r' and/or '-c'
options. '-r N:M' refers to the difference in the history of the
source branch between revisions N and M. You can use '-c M' to merge
single revisions: '-c M' is equivalent to '-r <M-1>:M'. Each such
difference is applied to TARGET_WCPATH.
If the mergeinfo in TARGET_WCPATH indicates that revisions within the
range were already merged, changes made in those revisions are not
merged again. If needed, the range is broken into multiple sub-ranges,
and each sub-range is merged separately.
A 'reverse range' can be used to undo changes. For example, when
source and target refer to the same branch, a previously committed
revision can be 'undone'. In a reverse range, N is greater than M in
'-r N:M', or the '-c' option is used with a negative number: '-c -M'
is equivalent to '-r M:<M-1>'. Undoing changes like this is also known
as performing a 'reverse merge'.
Multiple '-c' and/or '-r' options may be specified and mixing of
forward and reverse ranges is allowed.
- Cherry-pick Merge Example -
A bug has been fixed on trunk in revision 50. This fix needs to
be merged from trunk onto the release branch.
1.x-release +-----------------------o-----
/ ^
/ |
/ |
trunk ------+--------------------------LR-----
r50
In the above diagram, L marks the left side (trunk@49) and R marks the
right side (trunk@50) of the merge. The difference between the left
and right side is applied to the target working copy path.
Note that the difference between revision 49 and 50 is exactly those
changes that were committed in revision 50, not including changes
committed in revision 49.
To perform the merge, have a clean working copy of the release branch
and run the following command in its top-level directory; remember
that the default target is '.':
svn merge -c50 ^/trunk
You can also cherry-pick several revisions and/or revision ranges:
svn merge -c50,54,60 -r65:68 ^/trunk
3. This form is called a '2-URL merge':
svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]
You should use this merge variant only if the other variants do not
apply to your situation, as this variant can be quite complex to
master.
Two source URLs are specified, identifying two trees on the same
branch or on different branches. The trees are compared and the
difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the
working copy of the target branch at TARGET_WCPATH. The target
branch may be the same as one or both sources, or different again.
The three branches involved can be completely unrelated.
TARGET_WCPATH is a working copy path; if omitted, '.' is generally
assumed. The special cases noted above in the 'complete' merge form
also apply here.
SOURCE1 and/or SOURCE2 can also be specified as a working copy path,
in which case the merge source URL is derived from the working copy.
- 2-URL Merge Example -
Two features have been developed on separate branches called 'foo' and
'bar'. It has since become clear that 'bar' should be combined with
the 'foo' branch for further development before reintegration.
Although both feature branches originate from trunk, they are not
directly related -- one is not a direct copy of the other. A 2-URL
merge is necessary.
The 'bar' branch has been synced with trunk up to revision 500.
(If this revision number is not known, it can be located using the
'svn log' and/or 'svn mergeinfo' commands.)
The difference between trunk@500 and bar@HEAD contains the complete
set of changes related to feature 'bar', and no other changes. These
changes are applied to the 'foo' branch.
foo +-----------------------------------o
/ ^
/ /
/ r500 /
trunk ------+------+-----------------L---------> /
\ . /
\ ............ /
\ . /
bar +-----------------------------------R
In the diagram above, L marks the left side (trunk@500) and R marks
the right side (bar@HEAD) of the merge. The difference between the
left and right side is applied to the target working copy path, in
this case a working copy of the 'foo' branch.
To perform the merge, have a clean working copy of the 'foo' branch
and run the following command in its top-level directory:
svn merge ^/trunk@500 ^/bar
The exact changes applied by a 2-URL merge can be previewed with svn's
diff command, which is a good idea to verify if you do not have the
luxury of a clean working copy to merge to. In this case:
svn diff ^/trunk@500 ^/bar@HEAD
The following applies to all types of merges:
To prevent unnecessary merge conflicts, svn merge requires that
TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'
before starting a merge ensures that all items in the working copy are
based on the same revision.
If possible, you should have no local modifications in the merge's target
working copy prior to the merge, to keep things simpler. It will be
easier to revert the merge and to understand the branch's history.
Switched sub-paths should also be avoided during merging, as they may
cause incomplete merges and create subtree mergeinfo.
For each merged item a line will be printed with characters reporting the
action taken. These characters have the following meaning:
A Added
D Deleted
U Updated
C Conflict
G Merged
E Existed
R Replaced
Characters in the first column report about the item itself.
Characters in the second column report about properties of the item.
A 'C' in the third column indicates a tree conflict, while a 'C' in
the first and second columns indicate textual conflicts in files
and in property values, respectively.
- Merge Tracking -
Subversion uses the svn:mergeinfo property to track merge history. This
property is considered at the start of a merge to determine what to merge
and it is updated at the conclusion of the merge to describe the merge
that took place. Mergeinfo is used only if the two sources are on the
same line of history -- if the first source is an ancestor of the second,
or vice-versa (i.e. if one has originally been created by copying the
other). This is verified and enforced when using sync merges and
reintegrate merges.
The --ignore-ancestry option prevents merge tracking and thus ignores
mergeinfo, neither considering it nor recording it.
- Merging from foreign repositories -
Subversion does support merging from foreign repositories.
While all merge source URLs must point to the same repository, the merge
target working copy may come from a different repository than the source.
However, there are some caveats. Most notably, copies made in the
merge source will be transformed into plain additions in the merge
target. Also, merge-tracking is not supported for merges from foreign
repositories.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-c [--change] ARG : 版本 ARG (如同 -r ARG-1:ARG) 做的修改
如果 ARG 为负数则等价于 -r ARG:ARG-1 如果 ARG 的格式是 ARG1-ARG2，那么它等价于
ARG1:ARG2，包含 ARG1
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--force : force deletions even if deleted contents don't match
--dry-run : 尝试操作但没有修改
--diff3-cmd ARG : 使用 ARG 作为合并命令
--record-only : 只合并合并信息的差异
-x [--extensions] ARG : Specify differencing options for external diff or
internal diff or blame. Default: '-u'. Options are
separated by spaces. Internal diff and blame take:
-u, --unified: Show 3 lines of unified context
-b, --ignore-space-change: Ignore changes in
amount of white space
-w, --ignore-all-space: Ignore all white space
--ignore-eol-style: Ignore changes in EOL style
-U ARG, --context ARG: Show ARG lines of context
-p, --show-c-function: Show C function name
--ignore-ancestry : disable merge tracking; diff nodes as if related
--accept ARG : 指定自动解决冲突动作
('postpone', 'working', 'base', 'mine-conflict',
'theirs-conflict', 'mine-full', 'theirs-full',
'edit', 'launch')
(shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')
--reintegrate : deprecated
--allow-mixed-revisions : Allow operation on mixed-revision working copy.
Use of this option is not recommended!
Please run 'svn update' instead.
-v [--verbose] : 打印附加信息
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
mergeinfo: Display merge-related information.
usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]
2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]
1. Summarize the history of merging between SOURCE and TARGET. The graph
shows, from left to right:
the youngest common ancestor of the branches;
the latest full merge in either direction, and thus the common base
that will be used for the next complete merge;
the repository path and revision number of the tip of each branch.
2. Print the revision numbers on SOURCE that have been merged to TARGET
(with --show-revs=merged), or that have not been merged to TARGET
(with --show-revs=eligible). Print only revisions in which there was
at least one change in SOURCE.
If --revision (-r) is provided, filter the displayed information to
show only that which is associated with the revisions within the
specified range. Revision numbers, dates, and the 'HEAD' keyword are
valid range values.
SOURCE and TARGET are the source and target branch URLs, respectively.
(If a WC path is given, the corresponding base URL is used.) The default
TARGET is the current working directory ('.'). REV specifies the revision
to be considered the tip of the branch; the default for SOURCE is HEAD,
and the default for TARGET is HEAD for a URL or BASE for a WC path.
The depth can be 'empty' or 'infinity'; the default is 'empty'.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-R [--recursive] : 向下递归，与 --depth=infinity 相同
-q [--quiet] : 不打印信息，或只打印概要信息
-v [--verbose] : 打印附加信息
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--show-revs ARG : 指定显示哪个版本集合
('merged', 'eligible')
--log : show revision log message, author and date
--incremental : 给予适合串联的输出
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
mkdir: 创建纳入版本控制的新目录。
用法: 1、mkdir PATH...
2、mkdir URL...
创建版本控制的目录。
1、每个以工作副本 PATH 指定的目录，都会在本地创建，并且加入增加
调度，直到下次提交。
2、每个以 URL 指定的目录，都会通过立即提交在版本库中创建。
在这两个情况下，所有的中间目录都必须事先存在，
除非使用选项 --parents。
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
--parents : 创建中间目录
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
move (mv, rename, ren): Move (rename) an item in a working copy or repository.
usage: move SRC... DST
SRC and DST can both be working copy (WC) paths or URLs:
WC -> WC: move an item in a working copy, as a local change to
be committed later (with or without further changes)
URL -> URL: move an item in the repository directly, immediately
creating a new revision in the repository
All the SRCs must be of the same type. When moving multiple sources,
they will be added as children of DST, which must be a directory.
SRC and DST of WC -> WC moves must be committed in the same revision.
Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.
To avoid unnecessary conflicts, it is recommended to run 'svn update'
to update the subtree to a single revision before moving it.
The --allow-mixed-revisions option is provided for backward compatibility.
The --revision option has no use and is deprecated.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : 不打印信息，或只打印概要信息
--force : 强制操作运行
--parents : 创建中间目录
--allow-mixed-revisions : Allow operation on mixed-revision working copy.
Use of this option is not recommended!
Please run 'svn update' instead.
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
patch: Apply a patch to a working copy.
usage: patch PATCHFILE [WCPATH]
Apply a unidiff patch in PATCHFILE to the working copy WCPATH.
If WCPATH is omitted, '.' is assumed.
A unidiff patch suitable for application to a working copy can be
produced with the 'svn diff' command or third-party diffing tools.
Any non-unidiff content of PATCHFILE is ignored, except for Subversion
property diffs as produced by 'svn diff'.
Changes listed in the patch will either be applied or rejected.
If a change does not match at its exact line offset, it may be applied
earlier or later in the file if a match is found elsewhere for the
surrounding lines of context provided by the patch.
A change may also be applied with fuzz, which means that one
or more lines of context are ignored when matching the change.
If no matching context can be found for a change, the change conflicts
and will be written to a reject file with the extension .svnpatch.rej.
For each patched file a line will be printed with characters reporting
the action taken. These characters have the following meaning:
A Added
D Deleted
U Updated
C Conflict
G Merged (with local uncommitted changes)
Changes applied with an offset or fuzz are reported on lines starting
with the '>' symbol. You should review such changes carefully.
If the patch removes all content from a file, that file is scheduled
for deletion. If the patch creates a new file, that file is scheduled
for addition. Use 'svn revert' to undo deletions and additions you
do not agree with.
Hint: If the patch file was created with Subversion, it will contain
the number of a revision N the patch will cleanly apply to
(look for lines like '--- foo/bar.txt (revision N)').
To avoid rejects, first update to the revision N using
'svn update -r N', apply the patch, and then update back to the
HEAD revision. This way, conflicts can be resolved interactively.
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
--dry-run : 尝试操作但没有修改
--strip ARG : 需要从补丁文件中的路径中裁剪的前导路径组件数量。
默认 --strip 0 不修改路径。指定 --strip 1 会将
路径 'doc/fudge/crunchy.html' 转换为
'fudge/crunchy.html'。指定 --strip 2 会得到
'crunchy.html' 。在所有平台中期望的组件分隔符
都是 '/'。前导 '/' 被计算为一个组件。
--reverse-diff : 反向应用补丁
--ignore-whitespace : 在模式匹配时，忽略空白
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
propdel (pdel, pd): Remove a property from files, dirs, or revisions.
usage: 1. propdel PROPNAME [PATH...]
2. propdel PROPNAME --revprop -r REV [TARGET]
1. Removes versioned props in working copy.
2. Removes unversioned remote prop on repos revision.
TARGET only determines which repository to access.
See 'svn help propset' for descriptions of the svn:* special properties.
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
--revprop : 在版本属性上操作(使用-r参数)
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
propedit (pedit, pe): Edit a property with an external editor.
usage: 1. propedit PROPNAME TARGET...
2. propedit PROPNAME --revprop -r REV [TARGET]
1. Edits versioned prop in working copy or repository.
2. Edits unversioned remote prop on repos revision.
TARGET only determines which repository to access.
See 'svn help propset' for descriptions of the svn:* special properties.
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
--revprop : 在版本属性上操作(使用-r参数)
-m [--message] ARG : 指定日志信息ARG
-F [--file] ARG : 从文件ARG读取日志信息
--force-log : 强制校验日志信息资源
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--encoding ARG : 将ARG的值视为字符编码
--with-revprop ARG : 在新版本设置版本属性 ARG
使用格式 name[=value]
--force : 强制操作运行
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
propget (pget, pg): Print the value of a property on files, dirs, or revisions.
usage: 1. propget PROPNAME [TARGET[@REV]...]
2. propget PROPNAME --revprop -r REV [TARGET]
1. Prints versioned props. If specified, REV determines in which
revision the target is first looked up.
2. Prints unversioned remote prop on repos revision.
TARGET only determines which repository to access.
With --verbose, the target path and the property name are printed on
separate lines before each value, like 'svn proplist --verbose'.
Otherwise, if there is more than one TARGET or a depth other than
'empty', the target path is printed on the same line before each value.
By default, an extra newline is printed after the property value so that
the output looks pretty. With a single TARGET, depth 'empty' and without
--show-inherited-props, you can use the --no-newline option to disable this
(useful when redirecting a binary property value to a file, for example).
See 'svn help propset' for descriptions of the svn:* special properties.
有效选项:
-v [--verbose] : print path, name and value on separate lines
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
--revprop : 在版本属性上操作(使用-r参数)
--strict : (deprecated; use --no-newline)
--no-newline : 不输出其后的换行符
--xml : 输出为 XML
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--show-inherited-props : retrieve properties set on parents of the target
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
proplist (plist, pl): List all properties on files, dirs, or revisions.
usage: 1. proplist [TARGET[@REV]...]
2. proplist --revprop -r REV [TARGET]
1. Lists versioned props. If specified, REV determines in which
revision the target is first looked up.
2. Lists unversioned remote props on repos revision.
TARGET only determines which repository to access.
With --verbose, the property values are printed as well, like 'svn propget
--verbose'. With --quiet, the paths are not printed.
See 'svn help propset' for descriptions of the svn:* special properties.
有效选项:
-v [--verbose] : print path, name and value on separate lines
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : don't print the path
--revprop : 在版本属性上操作(使用-r参数)
--xml : 输出为 XML
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--show-inherited-props : retrieve properties set on parents of the target
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
propset (pset, ps): Set the value of a property on files, dirs, or revisions.
usage: 1. propset PROPNAME PROPVAL PATH...
2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]
1. Changes a versioned file or directory property in a working copy.
2. Changes an unversioned property on a repository revision.
(TARGET only determines which repository to access.)
The value may be provided with the --file option instead of PROPVAL.
Property names starting with 'svn:' are reserved. Subversion recognizes
the following special versioned properties on a file:
svn:keywords - Keywords to be expanded. Valid keywords are:
URL, HeadURL - The URL for the head version of the file.
Author, LastChangedBy - The last person to modify the file.
Date, LastChangedDate - The date/time the file was last modified.
Rev, Revision, - The last revision the file changed.
LastChangedRevision
Id - A compressed summary of the previous four.
Header - Similar to Id but includes the full URL.
Custom keywords can be defined with a format string separated from
the keyword name with '='. Valid format substitutions are:
%a - The author of the revision given by %r.
%b - The basename of the URL of the file.
%d - Short format of the date of the revision given by %r.
%D - Long format of the date of the revision given by %r.
%P - The file's path, relative to the repository root.
%r - The number of the revision which last changed the file.
%R - The URL to the root of the repository.
%u - The URL of the file.
%_ - A space (keyword definitions cannot contain a literal space).
%% - A literal '%'.
%H - Equivalent to %P%_%r%_%d%_%a.
%I - Equivalent to %b%_%r%_%d%_%a.
Example custom keyword definition: MyKeyword=%r%_%a%_%P
Once a custom keyword has been defined for a file, it can be used
within the file like any other keyword: $MyKeyword$
svn:executable - If present, make the file executable. Use
'svn propdel svn:executable PATH...' to clear.
svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.
svn:mime-type - The mimetype of the file. Used to determine
whether to merge the file, and how to serve it from Apache.
A mimetype beginning with 'text/' (or an absent mimetype) is
treated as text. Anything else is treated as binary.
svn:needs-lock - If present, indicates that the file should be locked
before it is modified. Makes the working copy file read-only
when it is not locked. Use 'svn propdel svn:needs-lock PATH...'
to clear.
Subversion recognizes the following special versioned properties on a
directory:
svn:ignore - A list of file glob patterns to ignore, one per line.
svn:global-ignores - Like svn:ignore, but inheritable.
svn:auto-props - Automatically set properties on files when they are
added or imported. Contains key-value pairs, one per line, in the format:
PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE ...]
Example (where a literal ';' is escaped by adding another ';'):
*.html = svn:eol-style=native;svn:mime-type=text/html;; charset=UTF8
Applies recursively to all files added or imported under the directory
it is set on. See also [auto-props] in the client configuration file.
svn:externals - A list of module specifiers, one per line, in the
following format similar to the syntax of 'svn checkout':
[-r REV] URL[@PEG] LOCALPATH
Example:
http://example.com/repos/zig foo/bar
The LOCALPATH is relative to the directory having this property.
To pin the external to a known revision, specify the optional REV:
-r25 http://example.com/repos/zig foo/bar
To unambiguously identify an element at a path which may have been
subsequently deleted or renamed, specify the optional PEG revision:
-r25 http://example.com/repos/zig@42 foo/bar
The URL may be a full URL or a relative URL starting with one of:
../ to the parent directory of the extracted external
^/ to the repository root
/ to the server root
// to the URL scheme
^/../ to a sibling repository beneath the same SVNParentPath location
Use of the following format is discouraged but is supported for
interoperability with Subversion 1.4 and earlier clients:
LOCALPATH [-r PEG] URL
The ambiguous format 'relative_path relative_path' is taken as
'relative_url relative_path' with peg revision support.
Lines starting with a '#' character are ignored.
有效选项:
-F [--file] ARG : 从文件 ARG 读取属性值
--encoding ARG : 将ARG的值视为字符编码
-q [--quiet] : 不打印信息，或只打印概要信息
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
--targets ARG : 传递文件 ARG 内容为附件参数
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--revprop : 在版本属性上操作(使用-r参数)
--force : 强制操作运行
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
relocate: 重新定位工作副本，指向不同的版本库根 URL。
用法: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]
2. relocate TO-URL [PATH]
改写工作副本 URL 元数据，以反映仅版本库根 URL 的改变。这用于仅版本库根
URL 改变(例如方案或主机名称)，但是工作副本内容仍旧与版本库对应的情况。
1. FROM-PREFIX 和 TO-PREFIX 分别对应工作副本的旧 URL 与新 URL 开始子串
(如果你喜欢，可以指定完整的 URL)。请使用 'svn info' 来确定当前工作
副本的 URL。
2. TO-URL 是用于 PATH 的(完整的)新版本库 URL。
例如:
svn relocate http:// svn:// project1 project2
svn relocate http://www.example.com/repo/project \
svn://svn.example.com/repo/project
有效选项:
--ignore-externals : 忽略外部项目
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
resolve: Resolve conflicts on working copy files or directories.
usage: resolve [PATH...]
By default, perform interactive conflict resolution on PATH.
In this mode, the command is recursive by default (depth 'infinity').
The --accept=ARG option prevents interactive prompting and forces
conflicts on PATH to be resolved in the manner specified by ARG.
In this mode, the command is not recursive by default (depth 'empty').
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--accept ARG : 指定自动解决冲突动作的源
('base', 'working', 'mine-conflict',
'theirs-conflict', 'mine-full', 'theirs-full')
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
resolved: 删除工作副本中目录或文件的“冲突”状态。
用法: resolved PATH...
注意: 本子命令不会依语法来解决冲突或是删除冲突标记；它只是删除冲突相关的
附加文件，让 PATH 可以被再次提交。它已经过时，被
“svn resolve --accept working”取代。
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
revert: Restore pristine working copy state (undo local changes).
usage: revert PATH...
Revert changes in the working copy at or within PATH, and remove
conflict markers as well, if any.
This subcommand does not revert already committed changes.
For information about undoing already committed changes, search
the output of 'svn help merge' for 'undo'.
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
-R [--recursive] : 向下递归，与 --depth=infinity 相同
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
status (stat, st): Print the status of working copy files and directories.
usage: status [PATH...]
With no args, print only locally modified items (no network access).
With -q, print only summary information about locally modified items.
With -u, add working revision and server out-of-date information.
With -v, print full revision information on every item.
The first seven columns in the output are each one character wide:
First column: Says if item was added, deleted, or otherwise changed
' ' no modifications
'A' Added
'C' Conflicted
'D' Deleted
'I' Ignored
'M' Modified
'R' Replaced
'X' an unversioned directory created by an externals definition
'?' item is not under version control
'!' item is missing (removed by non-svn command) or incomplete
'~' versioned item obstructed by some item of a different kind
Second column: Modifications of a file's or directory's properties
' ' no modifications
'C' Conflicted
'M' Modified
Third column: Whether the working copy is locked for writing by
another Subversion client modifying the working copy
' ' not locked for writing
'L' locked for writing
Fourth column: Scheduled commit will create a copy (addition-with-history)
' ' no history scheduled with commit (item was newly added)
'+' history scheduled with commit (item was copied)
Fifth column: Whether the item is switched or a file external
' ' normal
'S' the item has a Switched URL relative to the parent
'X' a versioned file created by an eXternals definition
Sixth column: Whether the item is locked in repository for exclusive commit
(without -u)
' ' not locked by this working copy
'K' locked by this working copy, but lock might be stolen or broken
(with -u)
' ' not locked in repository, not locked by this working copy
'K' locked in repository, lock owned by this working copy
'O' locked in repository, lock owned by another working copy
'T' locked in repository, lock owned by this working copy was stolen
'B' not locked in repository, lock owned by this working copy is broken
Seventh column: Whether the item is the victim of a tree conflict
' ' normal
'C' tree-Conflicted
If the item is a tree conflict victim, an additional line is printed
after the item's status line, explaining the nature of the conflict.
The out-of-date information appears in the ninth column (with -u):
'*' a newer revision exists on the server
' ' the working copy is up to date
Remaining fields are variable width and delimited by spaces:
The working revision (with -u or -v; '-' if the item is copied)
The last committed revision and last committed author (with -v)
The working copy path is always the final field, so it can
include spaces.
The presence of a question mark ('?') where a working revision, last
committed revision, or last committed author was expected indicates
that the information is unknown or irrelevant given the state of the
item (for example, when the item is the result of a copy operation).
The question mark serves as a visual placeholder to facilitate parsing.
Example output:
svn status wc
M wc/bar.c
A + wc/qax.c
svn status -u wc
M 965 wc/bar.c
* 965 wc/foo.c
A + - wc/qax.c
Status against revision: 981
svn status --show-updates --verbose wc
M 965 938 kfogel wc/bar.c
* 965 922 sussman wc/foo.c
A + - 687 joe wc/qax.c
965 687 joe wc/zig.c
Status against revision: 981
svn status
M wc/bar.c
! C wc/qaz.c
> local missing, incoming edit upon update
D wc/qax.c
有效选项:
-u [--show-updates] : 显示更新信息
-v [--verbose] : 打印附加信息
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-q [--quiet] : 不打印未版本控制的条目
--no-ignore : disregard default and svn:ignore and
svn:global-ignores property ignores
--incremental : 给予适合串联的输出
--xml : 输出为 XML
--ignore-externals : 忽略外部项目
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
switch (sw): 更新工作副本至同一版本库中的不同 URL。
用法: 1、switch URL[@PEGREV] [PATH]
2、switch --relocate FROM-PREFIX TO-PREFIX [PATH...]
1、更新工作副本，与同一版本库中的新 URL 对应。其行为跟 “svn update” 很像，
也是将工作副本切换到同一版本库中某个分支或者标签的方法。PEGREV 决定从
哪个版本查找目标。
如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动
导致失败。如果障碍路径与版本库中的对应路径类型相同(文件或目录)，它将成
为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能是障
碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，
将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。
使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。
如果新 URL 与工作副本路径没有版本继承关系，Subversion 将会拒绝操作。选项
'--ignore-ancestry' 可以禁止此检查。
2、选项 “--relocate” 已经淘汰。它的句法等价于
“svn relocate FROM-PREFIX TO-PREFIX [PATH]”。
参见 “svn help update” 以获取报告执行动作的字符列表。
样例:
svn switch ^/branches/1.x-release
svn switch --relocate http:// svn://
svn switch --relocate http://www.example.com/repo/project \
svn://svn.example.com/repo/project
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--set-depth ARG : 设置工作副本的新深度为 ARG('exclude',
'empty', 'files', 'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--diff3-cmd ARG : 使用 ARG 作为合并命令
--relocate : 通过URL改写重新定位
--ignore-externals : 忽略外部项目
--ignore-ancestry : allow switching to a node with no common ancestor
--force : handle unversioned obstructions as changes
--accept ARG : 指定自动解决冲突动作
('postpone', 'working', 'base', 'mine-conflict',
'theirs-conflict', 'mine-full', 'theirs-full',
'edit', 'launch')
(shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
unlock: 解除工作副本或URL的锁定。
用法: unlock TARGET...
使用 --force 终止锁定。
有效选项:
--targets ARG : 传递文件 ARG 内容为附件参数
--force : 强制操作运行
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
update (up): 将版本库的修改合并到工作副本中。
用法: update [PATH...]
如果没有指定版本，则将工作副本更新到 HEAD 版本。否则同步到 -r 选项所
指定的版本。
每更新一项就输出一行信息，使用首字符来报告执行的动作。这些字符的含义是:
A 已添加
D 已删除
U 已更新
C 合并冲突
G 合并成功
E 已存在
R 已替换
第一列字符报告项目本身。
第二列表示报告项目属性。
第三列中的字符“B”表示此文件上的锁被终止或窃取。
第四列中的字符“C”表示树冲突，同时“C”出现在第一列或第二列，分别表示
内容冲突或属性冲突。
如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动
导致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它
将成为受版本控制的路径，但是内容不改变。它意味着障碍路径的子孙，也可能
是障碍路径，同样会受版本控制。对于障碍路径中的文件，如果与版本库内的
不同，将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。
用第一列字符 “E” 来报告障碍路径。
如果工作副本中并没有指定的更新目标，但是有其父目录，那么就在指定路径上
将目标检出到其父目录中。如果使用了选项 --parents，就会创建目标的所有不
存在的父目录 (使用选项 --depth=empty)。
使用“--set-depth”选项设置此操作目标的工作副本之新深度。
有效选项:
-r [--revision] ARG : ARG (一些命令也接受ARG1:ARG2范围)
版本参数可以是如下之一:
NUMBER 版本号
'{' DATE '}' 在指定时间以后的版本
'HEAD' 版本库中的最新版本
'BASE' 工作副本的基线版本
'COMMITTED' 最后提交或基线之前
'PREV' COMMITTED的前一版本
-N [--non-recursive] : 过时；尝试 --depth=files 或 --depth=immediates
--depth ARG : 限制操作深度是 ARG ('empty', 'files',
'immediates', 或 'infinity')
--set-depth ARG : 设置工作副本的新深度为 ARG('exclude',
'empty', 'files', 'immediates', 或 'infinity')
-q [--quiet] : 不打印信息，或只打印概要信息
--diff3-cmd ARG : 使用 ARG 作为合并命令
--force : handle unversioned obstructions as changes
--ignore-externals : 忽略外部项目
--changelist [--cl] ARG : 只能对修改列表 ARG 的成员操作
--editor-cmd ARG : 使用 ARG 作为外部编辑器
--accept ARG : 指定自动解决冲突动作
('postpone', 'working', 'base', 'mine-conflict',
'theirs-conflict', 'mine-full', 'theirs-full',
'edit', 'launch')
(shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')
--parents : 创建中间目录
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
upgrade: 升级工作副本的元数据存储格式。
用法: upgrade [WCPATH...]
保留本地修改。
有效选项:
-q [--quiet] : 不打印信息，或只打印概要信息
全局选项:
--username ARG : 指定用户名称 ARG
--password ARG : specify a password ARG (caution: on many operating
systems, other users will be able to see this)
--no-auth-cache : 不要缓存用户认证令牌
--non-interactive : do no interactive prompting (default is to prompt
only if standard input is a terminal device)
--force-interactive : do interactive prompting even if standard input
is not a terminal device
--trust-server-cert : deprecated; same as
--trust-server-cert-failures=unknown-ca
--trust-server-cert-failures ARG : with --non-interactive, accept SSL server
certificates with failures; ARG is comma-separated
list of 'unknown-ca' (Unknown Authority),
'cn-mismatch' (Hostname mismatch), 'expired'
(Expired certificate), 'not-yet-valid' (Not yet
valid certificate) and 'other' (all other not
separately classified certificate errors).
--config-dir ARG : 从目录 ARG 读取用户配置文件
--config-option ARG : 以下属格式设置用户配置选项：
FILE:SECTION:OPTION=[VALUE]
例如：
servers:global:http-library=serf
扫一扫
938
被折叠的 条评论
为什么被折叠?
到【灌水乐园】发言
