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 2015/07/13 15:54:36 UTC
svn commit: r1690671 - in /subversion/branches/move-tracking-2: ./ CHANGES
build/ build/ac-macros/serf.m4 build/generator/gen_win_dependencies.py
build/run_tests.py subversion/ subversion/tests/cmdline/svnadmin_tests.py
tools/ tools/dist/release.py
Author: julianfoad
Date: Mon Jul 13 13:54:35 2015
New Revision: 1690671
URL: http://svn.apache.org/r1690671
Log:
On the 'move-tracking-2' branch: catch up to trunk@1690669.
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/CHANGES (contents, props changed)
subversion/branches/move-tracking-2/build/ (props changed)
subversion/branches/move-tracking-2/build/ac-macros/serf.m4
subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py
subversion/branches/move-tracking-2/build/run_tests.py
subversion/branches/move-tracking-2/subversion/ (props changed)
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/move-tracking-2/tools/ (props changed)
subversion/branches/move-tracking-2/tools/dist/release.py
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 13 13:54:35 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1606692-1689123
+/subversion/trunk:1606692-1690669
Modified: subversion/branches/move-tracking-2/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/CHANGES?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/CHANGES (original)
+++ subversion/branches/move-tracking-2/CHANGES Mon Jul 13 13:54:35 2015
@@ -196,6 +196,7 @@ http://svn.apache.org/repos/asf/subversi
* warn when the '--config-option' FILE:SECTION:OPTION combination may
be invalid. (r1674301 et al)
* ensure full key matching in membuffer cache (r1678950 et al)
+ * mod_dav_svn: expose cache statistics via HTTP (r1595160)
- Client-side bugfixes:
* export: fix problem exporting symlinks on windows (r1476093)
@@ -306,6 +307,7 @@ http://svn.apache.org/repos/asf/subversi
* merge: raise a tree conflict on root of obstructing dir (r1666690)
* cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
* status: fix incorrect output with file externals (issue #4580)
+ * merge: fix part of issue #4582 (r1686175, r1687029, r1688258)
- Server-side bugfixes:
* svnserve: don't ignore socket initialization errors (r1544253)
@@ -390,6 +392,9 @@ http://svn.apache.org/repos/asf/subversi
* fsfs: fix 'EOF found' error when reading repo (issue #4577)
* svnadmin freeze: unlock rep-cache.db as part of unfreezing
(r1679169, r1679287)
+ * fsfs: improve stability in the presence of power or network
+ disk failures during 'svnadmin pack' (r1683378)
+ * detect invalid svndiff data earlier (r1684077)
- Client-side and server-side bugfixes:
* use less memory when retrieving extension from filename (r1548480)
@@ -443,6 +448,7 @@ http://svn.apache.org/repos/asf/subversi
* bash_completion: stop offering deprecated options (r1662291)
* bash_completion: add '--show-item' and '--no-newline' (r1662622)
* svnbench: add null-blame command (r1673785, r1673803, r1674015)
+ * svnbench: install with default 'make install' (r1685085)
Developer-visible changes:
- General:
@@ -518,6 +524,9 @@ http://svn.apache.org/repos/asf/subversi
characters that must be escaped when used in a URL. (r1664997)
* fix breakage of the serf ra session with svn_ra_get_dir2() and
svn_ra_get_log2(). (r1665213, r1665259, r1665609)
+ * resolve a race condition in some test suite cleanup code (r1683303)
+ * fix some tests on non-US default locale on Windows (r1684034)
+ * document the meaning of "XFAIL" for users building from source (r1683071)
- API changes:
* new RA callbacks for managing ra_svn tunnels:
@@ -644,6 +653,7 @@ http://svn.apache.org/repos/asf/subversi
* svn_ra_get_file_revs2() now handles SVN_INVALID_REVNUM as HEAD (r1660463)
* new API svn_error_quick_wrapf() (r1662668)
* new API svn_fs_node_has_props() (r1673170, r1673172, r1673692, r1673746)
+ * new API svn_repos_verify_fs3() (r1492651 ... r1687769)
- Bindings:
* javahl: add support for the RA layer (r1494650 et al)
@@ -720,6 +730,7 @@ http://svn.apache.org/repos/asf/subversi
with newer versions of SWIG (1675149)
* javahl: requires Java 1.6 (r1677003)
* javahl: on OS X use /usr/libexec/java_home to find the JDK (r1675774)
+ * javahl: allow compiling with a C++11 compiler (r1684412)
Version 1.8.13
Propchange: subversion/branches/move-tracking-2/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 13 13:54:35 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
/subversion/branches/verify-keep-going/CHANGES:1439280-1546110
/subversion/branches/wc-collate-path/CHANGES:1402685-1480384
-/subversion/trunk/CHANGES:1606692-1682838
+/subversion/trunk/CHANGES:1606692-1690669
Propchange: subversion/branches/move-tracking-2/build/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 13 13:54:35 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/build:1462039-1462408
/subversion/branches/verify-keep-going/build:1439280-1546110
/subversion/branches/wc-collate-path/build:1402685-1480384
-/subversion/trunk/build:1606692-1688211
+/subversion/trunk/build:1606692-1690669
Modified: subversion/branches/move-tracking-2/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/ac-macros/serf.m4?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/ac-macros/serf.m4 (original)
+++ subversion/branches/move-tracking-2/build/ac-macros/serf.m4 Mon Jul 13 13:54:35 2015
@@ -168,7 +168,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
AC_MSG_RESULT([yes])
serf_found=yes
- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`]
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l`
dnl don't use --libs-only-L because then we might miss some options
LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
Modified: subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py Mon Jul 13 13:54:35 2015
@@ -925,11 +925,11 @@ class GenDependenciesBase(gen_base.Gener
# Pass -W0 to stifle the "-e:1: Use RbConfig instead of obsolete
# and deprecated Config." warning if we are using Ruby 1.9.
fp = os.popen('ruby -rrbconfig -W0 -e ' + escape_shell_arg(
- "puts Config::CONFIG['ruby_version'];"
- "puts Config::CONFIG['LIBRUBY'];"
- "puts Config::CONFIG['libdir'];"
- "puts Config::CONFIG['rubyhdrdir'];"
- "puts Config::CONFIG['arch'];"), 'r')
+ "puts RbConfig::CONFIG['ruby_version'];"
+ "puts RbConfig::CONFIG['LIBRUBY'];"
+ "puts RbConfig::CONFIG['libdir'];"
+ "puts RbConfig::CONFIG['rubyhdrdir'];"
+ "puts RbConfig::CONFIG['arch'];"), 'r')
try:
line = fp.readline()
if line:
@@ -958,9 +958,11 @@ class GenDependenciesBase(gen_base.Gener
if not lib_dir:
return
- # Visual C++ doesn't have a standard compliant snprintf yet
- # (Will probably be added in VS2013 + 1)
- defines = ['snprintf=_snprintf']
+ # Visual C++ prior to VS2015 doesn't have a standard compliant snprintf
+ if self.vs_version < '2015':
+ defines = ['snprintf=_snprintf']
+ else:
+ defines = []
ver = ruby_version.split('.')
ver = tuple(map(int, ver))
Modified: subversion/branches/move-tracking-2/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/run_tests.py?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/run_tests.py (original)
+++ subversion/branches/move-tracking-2/build/run_tests.py Mon Jul 13 13:54:35 2015
@@ -81,7 +81,8 @@ def _get_term_width():
def ioctl_GWINSZ(fd):
try:
import fcntl, termios, struct, os
- cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+ cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ,
+ struct.pack('hh', 0, 0)))
except:
return None
return cr
Propchange: subversion/branches/move-tracking-2/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 13 13:54:35 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/subversion:1462039-1462408
/subversion/branches/verify-keep-going/subversion:1439280-1546110
/subversion/branches/wc-collate-path/subversion:1402685-1480384
-/subversion/trunk/subversion:1606692-1689123
+/subversion/trunk/subversion:1606692-1690669
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svnadmin_tests.py Mon Jul 13 13:54:35 2015
@@ -2058,6 +2058,10 @@ def recover_old_empty(sbox):
def verify_keep_going(sbox):
"svnadmin verify --keep-going test"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
B_url = sbox.repo_url + '/B'
@@ -2158,6 +2162,10 @@ def verify_keep_going(sbox):
def verify_keep_going_quiet(sbox):
"svnadmin verify --keep-going --quiet test"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
B_url = sbox.repo_url + '/B'
@@ -2208,6 +2216,10 @@ def verify_keep_going_quiet(sbox):
def verify_invalid_path_changes(sbox):
"detect invalid changed path list entries"
+ # No support for modifying pack files
+ if svntest.main.options.fsfs_packing:
+ raise svntest.Skip('fsfs packing set')
+
sbox.build(create_wc = False)
repo_url = sbox.repo_url
@@ -2297,8 +2309,11 @@ def verify_invalid_path_changes(sbox):
".*r18: E160013:.*"])
if (svntest.main.fs_has_rep_sharing()):
exp_out.insert(0, ".*Verifying.*metadata.*")
- if svntest.main.is_fs_log_addressing():
- exp_out.insert(1, ".*Verifying.*metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 19 / svntest.main.options.fsfs_sharding):
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+ if svntest.main.is_fs_log_addressing():
+ exp_out.insert(0, ".*Verifying.*metadata.*")
exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.",
"svnadmin: E160020:.*",
@@ -2341,8 +2356,12 @@ def verify_invalid_path_changes(sbox):
if (svntest.main.fs_has_rep_sharing()):
exp_out.insert(0, ".*Verifying.*metadata.*")
- if svntest.main.is_fs_log_addressing():
- exp_out.insert(1, ".*Verifying.*metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 19 / svntest.main.options.fsfs_sharding):
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+ if svntest.main.is_fs_log_addressing():
+ exp_out.insert(0, ".*Verifying.*metadata.*")
+
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
output, errput, exp_out, exp_err):
raise svntest.Failure
@@ -2398,6 +2417,10 @@ def verify_denormalized_names(sbox):
if (svntest.main.fs_has_rep_sharing()):
expected_output_regex_list.insert(0, ".*Verifying repository metadata.*")
+ if svntest.main.options.fsfs_sharding is not None:
+ for x in range(0, 7 / svntest.main.options.fsfs_sharding):
+ expected_output_regex_list.insert(0, ".*Verifying.*metadata.*")
+
if svntest.main.is_fs_log_addressing():
expected_output_regex_list.insert(0, ".* Verifying metadata at revision 0.*")
Propchange: subversion/branches/move-tracking-2/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 13 13:54:35 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/tools:1462039-1462408
/subversion/branches/verify-keep-going/tools:1439280-1546110
/subversion/branches/wc-collate-path/tools:1402685-1480384
-/subversion/trunk/tools:1606692-1682838
+/subversion/trunk/tools:1606692-1690669
Modified: subversion/branches/move-tracking-2/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dist/release.py?rev=1690671&r1=1690670&r2=1690671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dist/release.py (original)
+++ subversion/branches/move-tracking-2/tools/dist/release.py Mon Jul 13 13:54:35 2015
@@ -86,12 +86,12 @@ except AttributeError:
tool_versions = {
'trunk' : {
'autoconf' : '2.69',
- 'libtool' : '2.4.3',
+ 'libtool' : '2.4.6',
'swig' : '2.0.12',
},
'1.9' : {
'autoconf' : '2.69',
- 'libtool' : '2.4.3',
+ 'libtool' : '2.4.6',
'swig' : '2.0.12'
},
'1.8' : {
@@ -356,6 +356,13 @@ class LibtoolDep(RollDep):
# system libtool (I'm looking at you, Debian).
return False
+ def build(self):
+ RollDep.build(self)
+ # autogen.sh looks for glibtoolize before libtoolize
+ bin_dir = os.path.join(get_prefix(self._base_dir), "bin")
+ os.symlink("libtoolize", os.path.join(bin_dir, "glibtoolize"))
+ os.symlink("libtool", os.path.join(bin_dir, "glibtool"))
+
class SwigDep(RollDep):
def __init__(self, base_dir, use_existing, verbose, swig_ver, sf_mirror):