diff options
Diffstat (limited to 'subversion/tests/cmdline/getopt_tests_data')
5 files changed, 56 insertions, 24 deletions
diff --git a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout index 0cd234d..06e5e03 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout @@ -1,5 +1,5 @@ usage: svn <subcommand> [options] [args] -Subversion command-line client, version X.Y.Z. +Subversion command-line client. Type 'svn help <subcommand>' for help on a specific subcommand. Type 'svn --version' to see the program version and RA modules or 'svn --version --quiet' to see just the version number. @@ -10,6 +10,7 @@ command, it recurses on the current directory (inclusive) by default. Available subcommands: add + auth blame (praise, annotate, ann) cat changelist (cl) diff --git a/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout b/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout index ab183ee..bb30055 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout @@ -1,5 +1,5 @@ -svn, version 1.8.0-dev (under development) - compiled Sep 10 2012, 14:00:24 on i386-apple-darwin11.4.0 +svn, version 1.9.0-dev (under development) + compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5 Copyright (C) 2012 The Apache Software Foundation. This software consists of contributions made by many people; @@ -14,9 +14,16 @@ The following repository access (RA) modules are available: * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme * ra_serf : Module for accessing a repository via WebDAV protocol using serf. + - using serf 1.3.3 - handles 'http' scheme - handles 'https' scheme +The following authentication credential caches are available: + +* Plaintext cache in /home/stsp/.subversion +* Gnome Keyring +* GPG-Agent + System information: * running on i386-apple-darwin11.4.0 diff --git a/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout b/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout index 346f218..513ec11 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout @@ -1,18 +1,26 @@ -svn, version 0.16.0 (r3987) - compiled Dec 5 2002, 00:02:51 +svn, version 1.9.0-dev (under development) + compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5 -Copyright (C) 2010 The Apache Software Foundation. +Copyright (C) 2014 The Apache Software Foundation. This software consists of contributions made by many people; see the NOTICE file for more information. Subversion is open source software, see http://subversion.apache.org/ The following repository access (RA) modules are available: -* ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - - handles 'http' scheme - - handles 'https' scheme -* ra_local : Module for accessing a repository on local disk. - - handles 'file' scheme * ra_svn : Module for accessing a repository using the svn network protocol. + - with Cyrus SASL authentication - handles 'svn' scheme +* ra_local : Module for accessing a repository on local disk. + - handles 'file' scheme +* ra_serf : Module for accessing a repository via WebDAV protocol using serf. + - using serf 1.3.3 + - handles 'http' scheme + - handles 'https' scheme + +The following authentication credential caches are available: + +* Plaintext cache in /home/stsp/.subversion +* Gnome Keyring +* GPG-Agent 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 59b92aa..4d06339 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 @@ -82,11 +82,11 @@ Valid options: 'BASE' base rev of item's working copy 'COMMITTED' last commit at or before BASE 'PREV' revision just before COMMITTED - -q [--quiet] : print nothing, or only summary information - -v [--verbose] : print extra information + -c [--change] ARG : the change made in revision ARG + -q [--quiet] : do not print the log message + -v [--verbose] : also print all affected paths -g [--use-merge-history] : use/display additional information from merge history - -c [--change] ARG : the change made in revision ARG --targets ARG : pass contents of file ARG as additional args --stop-on-copy : do not cross copies while traversing history --incremental : give output suitable for concatenation @@ -108,21 +108,29 @@ Valid options: 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 Global options: --username ARG : specify a username ARG - --password ARG : specify a password ARG + --password ARG : specify a password ARG (caution: on many operating + systems, other users will be able to see this) --no-auth-cache : do not cache authentication tokens --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') + --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 : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] @@ -188,7 +196,7 @@ Valid options: --relocate : relocate via URL-rewriting --ignore-externals : ignore externals definitions --ignore-ancestry : allow switching to a node with no common ancestor - --force : force operation to run + --force : handle unversioned obstructions as changes --accept ARG : specify automatic conflict resolution action ('postpone', 'working', 'base', 'mine-conflict', 'theirs-conflict', 'mine-full', 'theirs-full', @@ -197,15 +205,22 @@ Valid options: Global options: --username ARG : specify a username ARG - --password ARG : specify a password ARG + --password ARG : specify a password ARG (caution: on many operating + systems, other users will be able to see this) --no-auth-cache : do not cache authentication tokens --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') + --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 : read user configuration files from directory ARG --config-option ARG : set user configuration option in the format: FILE:SECTION:OPTION=[VALUE] diff --git a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout index 0cd234d..06e5e03 100644 --- a/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout +++ b/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout @@ -1,5 +1,5 @@ usage: svn <subcommand> [options] [args] -Subversion command-line client, version X.Y.Z. +Subversion command-line client. Type 'svn help <subcommand>' for help on a specific subcommand. Type 'svn --version' to see the program version and RA modules or 'svn --version --quiet' to see just the version number. @@ -10,6 +10,7 @@ command, it recurses on the current directory (inclusive) by default. Available subcommands: add + auth blame (praise, annotate, ann) cat changelist (cl) |