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

Changeset 1372192 is being indexed.

Sqlite amalgamation distributions are now distributed as .zip and with a new

naming convention.

* update url of sqlite amalgamation file to its current location.

Maybe this time really fix windows build with visual studio < 2010.

* build/generator/templates/svn_config.vcproj.ezt: Fix relative path to

svn_private_config.hw. Also fix the declared output of the build command

for that file, so that it matches the actual location.

* build/

(svn:eol-style): Set to native.

Maybe fix fallout from r1371633.

* build/generator/templates/svn_config_vcproj.ezt: Use [configs] instead of

$(ConfigurationName) when defining IntDir; the latter probably contains

the platform name, too.

Display Mac OS release name with svn --version --verbose.

* Remove KeyChain test to build/ac-macros/macosx.m4.

* aclocal.m4: Include build/ac-macros/macosx.m4.

* build/ac-macros/macosx.m4: New file.

(SVN_LIB_MACOS_PLIST): New. Check for Mac OS property list utilities.

(SVN_LIB_MACOS_KEYCHAIN): New. Implementation moved from

Don't check anything if SVN_LIB_MACOS_PLIST failed.

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

[SVN_HAVE_MACOS_PLIST]: Include CoreFoundation/CoreFoundation.h.

(svn_sysinfo__release_name): Conditionionally call macos_release_name.

(system_version_plist, value_from_dict,

release_name_from_version, macos_release_name): New, conditional.

Adjust the expected merge notification in 78 to account for a

harmless change due to the 'symmetric merge' code: issue #4217. Remove the


* subversion/tests/cmdline/

(dont_merge_revs_into_subtree_that_predate_it): Adjust expectations and

remove XFail.

On the inheritable-props branch: Sync with ^/subversion/trunk through


  1. … 54 more files in changeset.
Remove a comment in 78 that has been wrong since the change

made in r871974 ("Fix issue #3067, 'subtrees that don't exist at the start

or end of a merge range shouldn't break the merge'").

* subversion/tests/cmdline/

(dont_merge_revs_into_subtree_that_predate_it): Remove a comment.

On the inheritable-props branch: Atomically update cached iprops with

work queue items during update/switch editor drives. Remove the temporary

svn_client__update_inheritable_props API.

* subversion/include/private/svn_wc_private.h

(svn_wc__cache_iprops): Deleted, no callers.


svn_wc__get_switch_editor): Add argument

* subversion/libsvn_client/client.h

(svn_client__update_inheritable_props): Delete.

(svn_client__get_inheritable_props): New.

* subversion/libsvn_client/iprops.c

(need_to_cache_iprops): Gracefully handle the case where we ask about a

non-existant path.

(svn_client__update_inheritable_props): Delete.


* subversion/libsvn_client/switch.c (switch_internal):

* subversion/libsvn_client/update.c (update_internal):

Grab inheritable properties from the repository

for each WC root in the update target and pass these iprops to

svn_wc__get_[update|switch]_editor so it can set the iprops along with

the rest of the columns in the NODES table during the editor drive

callbacks. Also remove the call to the now defunct


* subversion/libsvn_wc/deprecated.c

(svn_wc_get_update_editor4): Update call to svn_wc__get_update_editor.

(svn_wc_get_switch_editor4): Update call to svn_wc__get_switch_editor.

* subversion/libsvn_wc/externals.c

(close_edit): Update call to svn_wc__db_op_bump_revisions_post_update.

* subversion/libsvn_wc/update_editor.c

(edit_baton): Add a new member to stash the set of iprops for all

working copy roots in the update target.

(close_directory): Pass along any iprops to


(close_edit): Pass along hash of WC root iprops to





Add new argument corresponding to new edit baton member.


* subversion/libsvn_wc/wc-queries.sql

(STMT_INSERT_NODE): Add inherited props parameter.

(STMT_INSERT_IPROP): Rename to...

(STMT_UPDATE_IPROP): ...this and remove op_depth parameter, op_depth

is always zero for this statement.

* subversion/libsvn_wc/wc_db.c

(insert_base_baton_t): Add a new member to stash base node's iprops.

(insert_base_node): Bind iprops.

(svn_wc__db_base_add_directory): Add new argument corresponding to new


(svn_wc__db_cache_iprops): Deleted, no longer used by any callers.

(db_op_set_rev_and_repos_relpath): Renamed to...

(db_op_set_rev_repos_relpath_iprops): ...this. Now handles setting iprops


(bump_node_revision): Add an optional hash of iprops argument from which

to set the node's inherited properties.

(bump_revisions_baton_t): New hash of iprops member.

(bump_revisions_post_update): Pass hash of iprops to bump_node_revision().

(svn_wc__db_op_bump_revisions_post_update): Add an optional hash of iprops

argument from which to set the node's inherited properties.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_base_add_directory): Add new argument corresponding to new


(svn_wc__db_cache_iprops): Deleted, no longer used by any callers.

(svn_wc__db_op_bump_revisions_post_update): Add an optional hash of iprops

argument from which to set the node's inherited properties.

* subversion/tests/libsvn_wc/db-test.c (test_inserting_nodes):

* subversion/tests/libsvn_wc/op-depth-test.c (svn_wc__db_base_add_directory):

Update calls to svn_wc__db_base_add_directory.

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.