Author: steveking
Date: Wed May 18 18:47:42 2011
New Revision: 1124375
URL: http://svn.apache.org/viewvc?rev=1124375&view=rev
Log:
Resolve issue #3887, "Eliminate client-specific suggestions from shared
libraries", by changing the error messages.
* subversion/libsvn_client/checkout.c
(svn_client__checkout_internal): remove reference to 'svn update'
* subversion/libsvn_wc/upgrade.c
(upgrade_to_wcng): remove reference to 'svn cleanup'
Modified:
subversion/trunk/subversion/libsvn_client/checkout.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
Modified: subversion/trunk/subversion/libsvn_client/checkout.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/checkout.c?rev=1124375&r1=1124374&r2=1124375&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/checkout.c (original)
+++ subversion/trunk/subversion/libsvn_client/checkout.c Wed May 18 18:47:42
2011
@@ -198,8 +198,8 @@ svn_client__checkout_internal(svn_revnum
if (strcmp(entry_url, session_url) != 0)
return svn_error_createf(
SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- _("'%s' is already a working copy for a different
URL;"
- " use 'svn update' to update it"),
+ _("'%s' is already a working copy for a"
+ " different URL"),
svn_dirent_local_style(local_abspath, pool));
}
}
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1124375&r1=1124374&r2=1124375&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed May 18 18:47:42 2011
@@ -1273,8 +1273,9 @@ 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; please "
- "run 'svn cleanup' with Subversion 1.6"));
+ _("Cannot upgrade with existing logs; Use "
+ "an 1.6 client to clean up before using "
+ "this 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
