You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/01/14 14:16:28 UTC
svn commit: r1897035 - in /subversion/branches/multi-wc-format/subversion: libsvn_wc/adm_files.c tests/cmdline/upgrade_tests.py
Author: julianfoad
Date: Fri Jan 14 14:16:28 2022
New Revision: 1897035
URL: http://svn.apache.org/viewvc?rev=1897035&view=rev
Log:
On the 'multi-wc-format' branch: fix two simple errors.
* subversion/libsvn_wc/adm_files.c
(svn_wc__internal_ensure_adm): fix bad error message parameters.
* subversion/tests/cmdline/upgrade_tests.py
(get_current_format): fix regex for matching '#define SVN_WC__VERSION'.
Modified:
subversion/branches/multi-wc-format/subversion/libsvn_wc/adm_files.c
subversion/branches/multi-wc-format/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/branches/multi-wc-format/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/libsvn_wc/adm_files.c?rev=1897035&r1=1897034&r2=1897035&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/branches/multi-wc-format/subversion/libsvn_wc/adm_files.c Fri Jan 14 14:16:28 2022
@@ -435,7 +435,7 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
return svn_error_createf(
SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
_("Format %d doesn't match existing format %d in '%s'"),
- target_format, present_format, db_revision, local_abspath);
+ target_format, present_format, local_abspath);
/* ### Should we match copyfrom_revision? */
if (db_revision != revision)
Modified: subversion/branches/multi-wc-format/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/subversion/tests/cmdline/upgrade_tests.py?rev=1897035&r1=1897034&r2=1897035&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/branches/multi-wc-format/subversion/tests/cmdline/upgrade_tests.py Fri Jan 14 14:16:28 2022
@@ -57,7 +57,7 @@ wc_is_too_old_regex = (".*is too old \(f
def get_current_format():
# Get current format from subversion/libsvn_wc/wc.h
format_file = open(os.path.join(os.path.dirname(__file__), "..", "..", "libsvn_wc", "wc.h")).read()
- return int(re.search("\n#define SVN_WC__VERSION (\d+)\n", format_file).group(1))
+ return int(re.search("\n *# *define +SVN_WC__VERSION +(\d+)\n", format_file).group(1))
def replace_sbox_with_tarfile(sbox, tar_filename,