Author: stsp
Date: Mon Jan 21 15:19:33 2013
New Revision: 1436409
URL: http://svn.apache.org/viewvc?rev=1436409&view=rev
Log:
* subversion/svn/status.c
(print_status): Say "X swapped places with Y" (plural places) instead of
"X swapped place with Y" (singular place).
* subversion/tests/cmdline/svntest/wc.py
(_re_parse_status_ex): Adjust accordingly.
Suggested by: neels
Review by: julianfoad
Modified:
subversion/trunk/subversion/svn/status.c
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
Modified: subversion/trunk/subversion/svn/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1436409&r1=1436408&r2=1436409&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Mon Jan 21 15:19:33 2013
@@ -298,7 +298,7 @@ print_status(const char *cwd_abspath, co
relpath = svn_dirent_local_style(relpath, pool);
moved_from_line = apr_pstrcat(pool, "\n > ",
apr_psprintf(pool,
- _("swapped place with %s"),
+ _("swapped places with %s"),
relpath),
(char *)NULL);
}
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1436409&r1=1436408&r2=1436409&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Mon Jan 21 15:19:33
2013
@@ -96,7 +96,7 @@ _re_parse_status = re.compile('^([?!MACD
_re_parse_status_ex = re.compile('^ ('
'( \> moved (from (?P<moved_from>.+)|to (?P<moved_to>.*)))'
- '|( \> swapped place with (?P<swapped_with>.+).*)'
+ '|( \> swapped places with (?P<swapped_with>.+).*)'
'|(\> (?P<tc>.+))'
')$')
