Author: stsp
Date: Sat Mar 15 12:04:36 2014
New Revision: 1577833
URL: http://svn.apache.org/r1577833
Log:
Follow-up to r1577828:
* tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Adjust expected output.
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified:
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1577833&r1=1577832&r2=1577833&view=diff
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Sat Mar 15 12:04:36 2014
@@ -190,7 +190,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',
