subversion

Checkout Tools
  • last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1863309 is being indexed.

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

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

    • ?
    /branches/1.10.x/subversion/libsvn_subr/sqlite3wrapper.c
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.12.x/subversion/svnserve/serve.c
Merge the r1859732 group from trunk:

* r1859732, r1859734

io: Implement the functions that check for node existence using the native

Win32 APIs on Windows.

Justification:

- This allows us to remove the hack from r1833621 and properly handle

reparse points on Windows irrespectively of the used APR version.

- This improves the I/O performance by using only a single call to

GetFileAttributes(), which is much faster than the generic stat

implementations from APR 1.6.x and 1.7.x (the latter should be

even more slower).

Votes:

+1: kotkov, rhuijben

    • ?
    /branches/1.12.x/subversion/libsvn_subr/io.c
Merge the r1860175 group from trunk:

* r1860175,r1860186,r1860187,r1860188

Fix building Subversion with Visual Studio 2005 and 2008.

Justification:

A change in 1.12 accidentally introduced a macro escaping issue

which broke compilation with these older versions of VC++.

Notes:

Should have been a simple patch. But lack of this version on my

development machine made things harder.

(I don't see a problem with dropping VS200 2008 support with

a future Subversion version, but then we should provide better

documentation on that change.)

Votes:

+1: rhuijben

    • ?
    /branches/1.12.x/build/generator/gen_win.py
    • ?
    /branches/1.12.x/build/generator/gen_vcnet_vcproj.py
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, rhuijben

    • ?
    /branches/1.12.x/subversion/libsvn_wc/wc_db_update_move.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 r1855419 from trunk:

* 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

Votes:

+1: stsp

+0: rhuijben

Mark all non-contentious nominated backports as approved, following our

silence-implies-consent decision.

Mark all non-contentious nominated backports as approved, following our

silence-implies-consent decision.

Mark all non-contentious nominated backports as approved, following our

silence-implies-consent decision.

On '1.10.x' branch: Backport r1863262 (Do not print password to screen in

svn_load_dirs.pl). A contrib script, so backported without voting.

This commit adds the missing mergeinfo.

On '1.12.x' branch: Backport r1863262 (Do not print password to screen in

svn_load_dirs.pl). A contrib script, so backported without voting.

This commit adds the missing mergeinfo.

On '1.10.x' branch: Backport r1863262 (Do not print password to screen in

svn_load_dirs.pl). A contrib script, so backported without voting.