diff options
Diffstat (limited to 'subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout')
| -rw-r--r-- | subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout | 86 |
1 files changed, 61 insertions, 25 deletions
diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout index 8db6f08..59b92aa 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout @@ -30,13 +30,48 @@ usage: 1. log [PATH][@REV] 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: - svn log - svn log foo.c - svn log bar.c@42 - svn log http://www.example.com/repo/project/foo.c - svn log http://www.example.com/repo/project foo.c bar.c - svn log http://www.example.com/repo/project@50 foo.c bar.c + + 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 Valid options: -r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range) @@ -65,28 +100,26 @@ Valid options: --diff : produce diff output --diff-cmd ARG : use ARG as diff command --internal-diff : override diff-cmd specified in config file - -x [--extensions] ARG : Default: '-u'. When Subversion is invoking an - external diff program, ARG is simply passed along - to the program. But when Subversion is using its - default internal diff implementation, or when - Subversion is displaying blame annotations, ARG - could be any of the following: - -u (--unified): - Output 3 lines of unified context. - -b (--ignore-space-change): - Ignore changes in the amount of white space. - -w (--ignore-all-space): - Ignore all white space. - --ignore-eol-style: - Ignore changes in EOL style. - -p (--show-c-function): - Show C function name in diff output. + -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 + -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 Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens - --non-interactive : do no interactive prompting + --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 : accept SSL server certificates from unknown certificate authorities without prompting (but only with '--non-interactive') @@ -154,7 +187,7 @@ Valid options: --diff3-cmd ARG : use ARG as merge command --relocate : relocate via URL-rewriting --ignore-externals : ignore externals definitions - --ignore-ancestry : ignore ancestry when calculating merges + --ignore-ancestry : allow switching to a node with no common ancestor --force : force operation to run --accept ARG : specify automatic conflict resolution action ('postpone', 'working', 'base', 'mine-conflict', @@ -166,7 +199,10 @@ Global options: --username ARG : specify a username ARG --password ARG : specify a password ARG --no-auth-cache : do not cache authentication tokens - --non-interactive : do no interactive prompting + --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 : accept SSL server certificates from unknown certificate authorities without prompting (but only with '--non-interactive') |