jorton in subversion

* STATUS: Nominate r1845555.

* STATUS: Nominate r1845555, r1845556, r1845559.

* subversion/svn/conflict-callbacks.c

(build_tree_conflict_options): No functional change; fix

indentation to avoid gcc -Wmisleading-indentation warning.

* subversion/libsvn_client/conflicts.c


No functional change; fix indentation to avoid gcc 8.x warning:

subversion/libsvn_client/conflicts.c: In function 'svn_client_conflict_option_get_moved_to_abspath_candidates2':

subversion/libsvn_client/conflicts.c:10855:7: warning: this 'if' clause does not guard... [-Wmisleading-indentation]

if (details == NULL ||


subversion/libsvn_client/conflicts.c:10864:8: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'

*possible_moved_to_abspaths = apr_array_make(result_pool, 1,


* Use $PYTHON (always defined by when

running build/ via esyscmd.

* STATUS: Nominate r1830885, r1831540, and r1830882.

* subversion/tests/cmdline/svntest/

(open_pipe): Run Python tests under the same Python executable for

all platforms rather than just Win32 (rather than finding one from

$PATH via /usr/bin/env).

Reviewed by: brane

* build/generator/

(Generator.write_standalone): Use the same Python executable as

used to run the script, which might not be called "python".

Fixes libsvn_auth_gnome_keyring.pc when configured with libsecret, and

make dependencies private.

*, build/ac-macros/libsecret.m4:

Set SVN_GNOME_KEYRING_PCLIBS to libsecret/gnome-keyring as appropriate.

* build.conf (gnome-keyring):

Substitute SVN_GNOME_KEYRING_PCLIBS as private deps of

libsvn_auth_gnome_keyring in generated pkg-config file.

Reviewed by: philip

Revert r1690591 which broke SWIG < 3.0.6.

* subversion/bindings/swig/include/proxy.swg:

Use %{ %} with %pythoncode so comments avoid the SWIG preprocessor,

fixing the bindings with SWIG 3.0.6.

* STATUS: Vote for r1292248.