Dashboard

Update 'CHANGES' for the upcoming 1.12, 1.10, 1.9 releases.
Removed -XX:+PrintFlagsFinal from jvm.config

HDDS-1779. TestWatchForCommit tests are flaky.Contributed by Shashikant Banerjee. (#1071)

vote

cleanup after backport of change
Merge of r1862014 from trunk:

*) mod_proxy_hcheck fix for BZ 60948

Merge of r1851146 from trunk:

*) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with

an URL that contains a :port.

PR 53915 [Rein Tollevik <rein basefarm.no>]

Merge of r1426802,1744460,1829799,1824716,1838318,1840678,1861294

*) easy patches to synch 2.4.x and trunk:

- core: extend description of r->hostname

- mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL

- core: Save a few cycles in 'ap_parse_form_data()'

- mod_cache_socache: Save some cycles

- mod_proxy_ftp: Save some cycle

- vhost: move an assignment to the end of the loop to ease readability and please a compiler

- core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'

Merge of r1847430,r1853302 from trunk:

*) core: Split out the ability to parse wildcard files and directories

from the Include/IncludeOptional directives into a generic set of

functions ap_dir_nofnmatch() and ap_dir_fnmatch().

* vote+promote

Remove the '1.9.x-r1860936' branch, merged in r1863312.
Merge the 1.9.x-r1860936 branch:

* r1860936, r1860951, r1860958

Provide a way for svnserve's 'get-deleted-rev' API to return 'not deleted'.

Justification:

Error handling was inconsistent across RA layers.

Branch:

^/subversion/branches/1.9.x-r1860936

Votes:

+1: julianfoad, stsp

Merge r1856397 from trunk:

* r1856397

Allow generating Visual Studio 2019 projects

Justification:

Makes it easier to build Subversion on Windows. Simple local fix.

Votes:

+1: rhuijben

Merge r1857391 from trunk:

* r1857391

Fix build with APR 1.7.0.

Justification:

Bogus configure script check relies on APR internals.

See https://svn.haxx.se/users/archive-2019-04/0041.shtml

and https://svn.haxx.se/dev/archive-2019-04/0020.shtml

Votes:

+1: stsp

Merge r1852436 from trunk:

* r1852436

Make 'svn update' not record a tree conflict when deleting an unmodified

directory which happens to contain unversioned items.

Justification:

Unnecessary tree conflict due to e.g. build artifacts on disk.

User complained: https://svn.haxx.se/users/archive-2019-01/0060.shtml

IRC discussion:

https://colabti.org/irclogger/irclogger_log/svn-dev?date=2019-01-29#l10

Votes:

+1: stsp

Merge r1852013 from trunk:

* r1852013

Fix issue #4804: avoid test failures just because some SQLite compile-time

feature was enabled that changes its query plan descriptions.

Justification:

Reported build failure on Gentoo Linux, see:

https://bugs.gentoo.org/605438

Votes:

+1: brane, stsp

Merge r1850651 from trunk:

* r1850651

Fix a use-after-free in mod_dav_svn's logging of FS warnings.

Justification:

Lots of crashes on OpenBSD during 'make check' with HTTPD 2.4.

See https://svn.haxx.se/dev/archive-2018-12/0137.shtml

Votes:

+1: stsp, brane

Merge r1845212 from trunk:

* r1845212

Silence a deprecation warning from amalgamated SQLite on macOS.

Justification:

Keeps the macOS warnings checker buildslave clean.

Votes:

+1: brane, stsp

Merge the r1860936 group from trunk:

* r1860936, r1860951, r1860958

Provide a way for svnserve's 'get-deleted-rev' API to return 'not deleted'.

Justification:

Error handling was inconsistent across RA layers.

Votes:

+1: julianfoad, stsp

    • ?
    /branches/1.10.x/subversion/svnserve/serve.c
Merge r1856397 from trunk:

* r1856397

Allow generating Visual Studio 2019 projects

Justification:

Makes it easier to build Subversion on Windows. Simple local fix.

Votes:

+1: rhuijben

Merge r1857391 from trunk:

* r1857391

Fix build with APR 1.7.0.

Justification:

Bogus configure script check relies on APR internals.

See https://svn.haxx.se/users/archive-2019-04/0041.shtml

and https://svn.haxx.se/dev/archive-2019-04/0020.shtml

Votes:

+1: stsp

Merge r1857367 from trunk:

* r1857367

Fix memory lifetime problem in a libsvn_wc error code path.

Justification:

Edge-case crash. Subversion should not crash.

Votes:

+1: stsp

    • ?
    /branches/1.10.x/subversion/libsvn_wc/wc_db_update_move.c
Remove the '1.10.x-r1855419' branch, merged in r1863300.
Merge the 1.10.x-r1855419 branch:

* r1855419

Fix conflict resolver bug where local and incoming edits got swapped.

Justification:

Bug breaks text conflict resolution.

User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml

Branch:

^/subversion/branches/1.10.x-r1855419

Votes:

+1: stsp

Merge the r1854072 group from trunk:

* r1854072, r1854074, r1854216

Fix issue #4806: Remove on-disk trees with read-only directories in them.

Justification:

Fixes an edge case in our tree removal code. If we clear read-only

permissions on files in order to remove them, we should do the same for

directories.

Votes:

+1: brane, stsp

Merge r1853483 from trunk:

* r1853483

Fix #4760 "Missing children when svnadmin dump --include/exclude converts

copy-dir to add-dir".

Justification:

The new feature was broken.

Votes:

+1: julianfoad, stsp

Merge r1853450 from trunk:

* r1853450

Enable 'incoming_move_file_merge' option only if local change is file edit.

Justification:

Conflict resolver misbehaves when it runs into move vs move conflicts.

Votes:

+1: stsp

Merge r1852436 from trunk:

* r1852436

Make 'svn update' not record a tree conflict when deleting an unmodified

directory which happens to contain unversioned items.

Justification:

Unnecessary tree conflict due to e.g. build artifacts on disk.

User complained: https://svn.haxx.se/users/archive-2019-01/0060.shtml

IRC discussion:

https://colabti.org/irclogger/irclogger_log/svn-dev?date=2019-01-29#l10

Votes:

+1: stsp

Merge r1852013 from trunk:

* r1852013

Fix issue #4804: avoid test failures just because some SQLite compile-time

feature was enabled that changes its query plan descriptions.

Justification:

Reported build failure on Gentoo Linux, see:

https://bugs.gentoo.org/605438

Votes:

+1: brane, stsp

Merge r1851920 from trunk:

* r1851920

Remove a useless common ancestor search from the conflict resolver.

Justification:

Current behaviour is inefficient and could lead to dubious conflicts.

Votes:

+1: stsp