This caused a test failure in upgrade_tests 1 and 2 on the ubuntu 64
buildbot. I think the test output needs to be adjusted.
-Hyrum
On Jun 22, 2009, at 6:17 PM, Arfrever Frehtes Taifersar Arahesis wrote:
> Author: arfrever
> Date: Mon Jun 22 16:17:24 2009
> New Revision: 38156
>
> Log:
> * subversion/libsvn_subr/io.c
> (svn_io_file_name_get):
> * subversion/libsvn_wc/lock.c
> (check_format_upgrade): Consistify some error messages.
>
> Modified:
> trunk/subversion/libsvn_subr/io.c
> trunk/subversion/libsvn_wc/lock.c
>
> Modified: trunk/subversion/libsvn_subr/io.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/io.c?pathrev=38156&r1=38155&r2=38156
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_subr/io.c Mon Jun 22 15:58:08 2009
> (r38155)
> +++ trunk/subversion/libsvn_subr/io.c Mon Jun 22 16:17:24 2009
> (r38156)
> @@ -2,7 +2,7 @@
> * io.c: shared file reading, writing, and probing code.
> *
> *
> ====================================================================
> - * Copyright (c) 2000-2008 CollabNet. All rights reserved.
> + * Copyright (c) 2000-2009 CollabNet. All rights reserved.
> *
> * This software is licensed as described in the file COPYING, which
> * you should have received as part of this distribution. The terms
> @@ -3600,7 +3600,7 @@ svn_io_file_name_get(const char **filena
>
> status = apr_file_name_get(&fname_apr, file);
> if (status)
> - return svn_error_wrap_apr(status, _("Can't get filename"));
> + return svn_error_wrap_apr(status, _("Can't get file name"));
>
> return svn_error_return(cstring_to_utf8(filename, fname_apr, pool));
> }
>
> Modified: trunk/subversion/libsvn_wc/lock.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/lock.c?pathrev=38156&r1=38155&r2=38156
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/libsvn_wc/lock.c Mon Jun 22 15:58:08 2009
> (r38155)
> +++ trunk/subversion/libsvn_wc/lock.c Mon Jun 22 16:17:24 2009
> (r38156)
> @@ -421,9 +421,12 @@ check_format_upgrade(const svn_wc_adm_ac
>
> if (wc_format != SVN_WC__VERSION)
> {
> - return svn_error_create(SVN_ERR_WC_UPGRADE_REQUIRED, NULL,
> - _("Working copy format is too old;
> please run "
> - "'svn upgrade'"));
> + return svn_error_createf(SVN_ERR_WC_UPGRADE_REQUIRED, NULL,
> + _("Working copy format of '%s' is
> too old (%d); "
> + "please run 'svn upgrade'"),
> + svn_path_local_style(adm_access->path,
> + scratch_pool),
> + wc_format);
> }
>
> return SVN_NO_ERROR;
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2364343
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2364512
Received on 2009-06-23 17:12:19 CEST