Author: cmpilato
Date: Thu May 19 06:34:31 2011
New Revision: 1124556
URL: http://svn.apache.org/viewvc?rev=1124556&view=rev
Log:
Followup to r1124375.
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): Minor error message wording tweaks.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1124556&r1=1124555&r2=1124556&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu May 19 06:34:31 2011
@@ -1273,9 +1273,10 @@ upgrade_to_wcng(void **dir_baton,
SVN_ERR(svn_io_check_path(logfile_path, &logfile_on_disk, scratch_pool));
if (logfile_on_disk == svn_node_file)
return svn_error_create(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
- _("Cannot upgrade with existing logs; Use "
- "an 1.6 client to clean up before using "
- "this client"));
+ _("Cannot upgrade with existing logs; run a "
+ "cleanup operation on this working copy using "
+ "a Subversion 1.6 client, then retry the "
+ "upgrade with the current client"));
/* Lock this working copy directory, or steal an existing lock. Do this
BEFORE we read the entries. We don't want another process to modify the