subversion

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

Changeset 1863296 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 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.

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.

Do not print password to screen in svn_load_dirs.pl.

* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in

(sanitize_pwd): New function.

(safe_read_from_pipe, read_from_process): Update the sites printing

the command line to screen to use sanitize_pwd.

(usage): Warn that other local OS users may be able to see the

password passed on the command-line.

Fix indentation; that is, replace the 2 tab occurrences by 8 spaces.

Patch by: Geoffrey Alary <geoffrey.alary{_AT_}gmail.com>

On branch swig-py3: Fix test after merging shelving-v3

* subversion/bindings/swig/python/tests/client.py:

(SubversionClientTestCase.test_shelf): Relax assert condition to be suitable

for changed behavior of shelved_func callback in

svn_client__shelf_save_new_version3().

Win32: tweak the SSL certificate validation override to avoid hitting the wire

for URL based objects and revocation checks.

The primary purpose of this callback is to resolve SVN_AUTH_SSL_UNKNOWNCA

failures using CryptoAPI and Windows local certificate stores. To do so, we

should be fine with just using the immediately available data on the local

machine.

Doing the opposite of that appears to be troublesome, as always connecting

to remote CRL and OCSP endpoints can result in spurious errors or significant

(user-reported) network stalls caused by timeouts if the endpoints are

inaccessible or unreliable.

The new approach should also be in par with the default basic behavior of

several major browsers, for example:

https://chromium.googlesource.com/chromium/src/net/+/3d1dad1c17ae3ff59e7c35841af94b66f4bca1ba/cert/cert_verify_proc_win.cc#919

* subversion/libsvn_subr/win32_crypto.c

(windows_validate_certificate): Use the CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL

and CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY flags when preparing the

certificate chain. Ignore errors in obtaining valid revocation information

when verifying the chain, as they could be induced by the new cache-only

behavior.

On branch swig-py3: avoid crash when status is NULL

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

(svn_swig_py_client_status_func) Allow NULL for status.

On branch swig-py3: Catchup to trunk @r1862753.
  1. … 166 more files in changeset.
* STATUS: Vote for r1860936 group.

* STATUS (r1860936 group): Point to a backport branch which resolves a trivial merge conflict, and so should allow the backports buildbot to test it.
Create a backport branch for the r1860936 group, with its three revisions merged and the trivial conflict resolved.
* STATUS: Nominate r1860936, r1860951, r1860958.
* STATUS: Nominate r1860936, r1860951, r1860958.
* STATUS: Nominate r1860936, r1860951, r1860958.
In svnserve, consistently handle errors in opening a repository.

These errors are still logged and reported to the client, as they were

before, but now it is done in the same way as everywhere else. (The error

logging now happens higher up the call stack.)

* subversion/svnserve/serve.c

After reporting an error to the client, don't log it explicity here and

then clear it; instead return it so the caller can do so.