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

Changeset 1371633 is being indexed.

On Windows, create the generated svn_private_config.h in the intermediate

build directory so that different configurations don't all use the same

canonical host name. This incidentally allows Windows and Unix builds to

share the same working copy in parallel.

* build\generator\templates\svn_config.vcproj.ezt,

build\generator\templates\svn_config.vcxproj.ezt: Change output path

of svn_private_config.h. Add generated SQL headers to project.

* build\generator\templates\vcnet_vcproj.ezt,

build\generator\templates\vcnet_vcxproj.ezt: Add build directory to

list of project-specific include paths.

Merge r1371282 from trunk:

* r1371282

Fix a sandbox violation in a test suite test. (The test executes

'svn' outside the typical framework for doing so without pointing

the binary at the controlled runtime configuration directory used

by other tests.)


Broken tests lead to false positives in the hunt for broken



+1: cmpilato, brane, julianfoad

subversion/libsvn_subr/sysinfo.c: spelling fix.

* STATUS: Vote, approving the test suite sandbox fix r1371282.
On the 'master-passphrase' branch: fix a segfault triggered by running

in --non-interactive mode.

* subversion/libsvn_subr/cmdline.c

(get_master_passphrase_auth_baton): Initialize the provider list

when non_interactive is set, too.

* STATUS: Vote for r1371282.
Teach serf build on Windows to use static APR/Util and OpenSSL.

Note: The APR_STATIC support requires a patch to serf.mak,


* New option --with-static-openssl.

* build/generator/ (write_serf_project_file):

Send configuration for static APR and OpenSSL linking to the serf

project file generator.

* build/generator/templates/serf.vcproj.ezt,

build/generator/templates/serf.vcxproj.ezt: Update nmake command templates.

Indentation fix only.
Propose r1371282 for backport to 1.7.x.
Fix a sandbox violation in 35.

* subversion/tests/cmdline/

(propget_redirection): Consult the controlled test-suite runtime

config when invoking 'svn' directly.

* CHANGES: Add node about "svn --version --verbose".

Add module version info to "svn --version --verbose" output on Windows.

* subversion/libsvn_subr/sysinfo.c (file_version_number): New.

(win32_shared_libs): Make static. Display module version when available.

* Add quotes to the new sys/utsname.h check to see if it

fixes the centos buildbot.

Display list of loaded DLLs with "svn --version --verbose" on Windows.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info):

Update output for loaded module list.

* subversion/libsvn_subr/sysinfo.c [WIN32]: Import psapi.h

Import apr_file_info.h.

(win32_shared_libs, enum_loaded_modules, FNENUMPROCESSMODULES): New.

(svn_sysinfo__loaded_libs) [WIN32]: Call win32_shared_libs.

Tagging release 1.7.6
    • ?
* subversion/include/svn_version.h (SVN_VER_PATCH): Bump to 7.
* subversion/tests/cmdline/

(avoid_reflected_revs): Tweak this XFAIL test to not expect conflicts,

since the ideal result would be a clean merge. That expectation appears

to have been set in error when I merged the tree-conflicts branch to

trunk in r873156. Also improve the comments.

Rewrite the Windows release name constructor to use info from the registry

instead of using flaky mappings that rely on constants that may or may not

be defined in older SDK releases.

* subversion/libsvn_subr/sysinfo.c [WIN32]: Add comments.

(wcs_to_utf8, registry_value): New.

(win32_release_name): Rewrite.

(FNGETPRODUCTINFO, default_release_name): Remove.


(N_, U_, _, Q_): Add doc strings to the gettext localization macros.

Update the help text for 'svn merge' to reflect symmetric merge. There is

more to do here, especially with the 'sync merge example' and 'reintegrate

merge example' sections.

* subversion/svn/main.c

(svn_cl__options): Just say 'deprecated'.

(svn_cl__cmd_table): Update 'svn merge' text, combining sections 1 and 2.

Expand "svn --version" output with information about the running system

when --verbose is also given on the command line. Currently available:

- Minimal running system info on systems with uname().

- System info and commercial release name on Windows.

* build.conf (libsvn_subr): Require kernel32.lib on Windows.

* Check for uname() in sys/utsname.h.

* subversion/include/svn_opt.h (svn_opt_print_help4): New, with verbose option.

(svn_opt_print_help3): Deprecate.

* subversion/libsvn_subr/sysinfo.c, subversion/libsvn_subr/sysinfo.h: New.

* subversion/libsvn_subr/opt.h (svn_opt__print_version_info): Add "verbose".

* subversion/libsvn_subr/opt.c: Include sysinfo.h.

(svn_opt__print_version_info): In verbose mode, print svn_sysinfo__*.

(svn_opt_print_help4): Implement.

(svn_opt_print_help3): Remove.

* subversion/libsvn_subr/deprecated.c

(svn_opt_print_help3, svn_opt_print_help3): Reimplenment in terms of


(svn_opt_print_help): Update call to svn_opt__print_version_info.

* subversion/svn/main.c: Add --verbose option to "svn --version".

* subversion/svnlook/main.c: Add --verbose option to "svn --version".

Use svn_opt_print_help4 instead of svn_opt_print_help3.

* subversion/svn/help-cmd.c, subversion/svnadmin/main.c,

subversion/svndumpfilter/main.c, subversion/svnmucc/svnmucc.c,

subversion/svnrdump/svnrdump.c, subversion/svnserve/main.c,

subversion/svnsync/main.c, subversion/svnversion/main.c,



Use svn_opt_print_help4 instead of svn_opt_print_help3.

    • ?
    • ?
  1. … 5 more files in changeset.
* STATUS: Add r1370801 to r1368662, r1370526, r1370557.
* build/ (_wincpu_map): s/alfa/alpha/g; add amd64.

Found by: julianf

* CHANGES: Sync with trunk (a mergeinfo change only).
* CHANGES: Estimate 1.7.6 release date.

* CHANGES: Sync with trunk, estimate release date.

[note from the future: release date change should have been made on trunk first]

* CHANGES: Add more 1.7.6 items.

* STATUS: Propose r1370557 which fixes breakage in r1370526.

Fix breakage from r1370526: expose the svn_python variable to the svn_config

project file generator.

* build/generator/ (svn_config): Expose svn_python

outside the SQL-file-specific enumeration.

* build/generator/templates/svn_config.vcxproj.ezt,

build/generator/templates/svn_config.vcproj.ezt: Update temppates.

Add Windows-specific r1370526 to proposal for r1368662

and update votes.