subversion

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

Changeset 1660648 is being indexed.

* STATUS: Nominate r1660646.
Fix an ugly corner case in the upgrade from entries code where replaced

directories would receive an invalid repository location.

In general WC-NG wouldn't use the value, as they are never recorded

on an op-root, and commit only uses these paths from op-roots.

This case tripped the validation rules from upgrade tests #16.

* subversion/libsvn_wc/entries.c

(write_entry): Fix repository location for directories.

entry->name was "" for the directory itself. Use revision

from same source as repos-path and repos-id.

Following up on r1660610, add another pool cleanup handler to

handle the case where the root pool is cleaned up before

the state pool.

This should fix the problems in the swig bindings.

* subversion/libsvn_subr/sqlite.c

(function_wrapper_baton_t): Hold state pool reference.

(clear_sqlite_function_scratch): Add forward definition.

(clear_sqlite_function): Rename to...

(clear_sqlite_function_state): ... this. Reset registration.

(clear_sqlite_function_scratch): New function.

(svn_sqlite__create_scalar_function): Add second registration.

Fix the op-depth calculations in db-tests.c, to no longer trip +-

every validation rule of op-depths. This involved changing

a local added subdir (with descendants at the same op-depth!)

into a copy.

These testcases were written before NODES introduced op-depth,

and the tests were only updated to not trigger test failures.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Make ancestor check a bit stricter.

* subversion/tests/libsvn_wc/db-test.c

(TESTING_DATA): Tweak setup.

(test_pdh): Install ancestor for not-present to avoid

error.

(validate_abspath): Tweak function to print paths on error.

(test_scan_addition): Tweak expectations after transforming

add into a copy.

(test_scan_deletion): Tweak test. Minor change to handle

working delete.

* STATUS: Vote -0 for r1536854 "Make 'svnadmin verify' detect inconsistencies".
Make it possible to run sqlite queries that use user defined functions

when the child pools of the pool containing the sqlite database

are being cleaned up.

This is necessary to use op-depth calculations in verification queries.

(or to run queries at all when the verification triggers are used)

* subversion/libsvn_subr/sqlite.c

(clear_sqlite_function): New function.

(svn_sqlite__create_scalar_function): Document nasty problem.

Create function pool in global pool.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Extend verifications.

* subversion/tests/libsvn_wc/wc-queries-test.c

(relpath_depth_sqlite): New function (stub).

(test_verify_parsable): Define relpath_depth.

* STATUS: Changing to +1 vote for the r1652182 / issue 4551 group.
On the '1.7.x-issue4551' branch: avoid requiring a recent APR version.^M^M* subversion/svnrdump/load_editor.c

(close_node): Avoid using apr_hash_this_key/val.

* STATUS: Nominate r1660593 via backport branch.
On the r1660593 branch: Merge r1660508,1660593 without verification changes.
Create backport branch for r1660593
* STATUS: First 1.9.x nomination: r1660593.
Stop setting last-rev, last-date and last-author on foreign repos copies

and merges. Fix consistency between svn_wc__db_op_copy_XXX() methods.

This fixes a bug in our entries compatibility code, as that assumes that

there is a copy if there is a last-rev.

* subversion/libsvn_wc/adm_ops.c

(svn_wc_add4): Update caller.

* subversion/libsvn_wc/update_editor.c

(svn_wc__complete_directory_add): Update caller.

* subversion/libsvn_wc/wc_db.c

(insert_working_node): Don't set pristine properties on local additions.

(svn_wc__db_op_copy_dir): Move is_moved argument last. Don't set changed*

and properties on local additions.

(svn_wc__db_op_copy_file): Don't set changed* and properties on local

additions.

(svn_wc__db_op_copy_symlink): Calulate moved_to like the other operations.

Don't set changed* and properties on local

additions.

* subversion/tests/cmdline/copy_tests.py

(repos_to_wc): Fix test expectation.

* STATUS: -0 on the r1652182 / issue 4551 group due to build problem.
* STATUS: Vote for and approve r1651759.
Fix more cases where the direct db operations in the C tests create nonstandard

db instances.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Extend tests.

* subversion/tests/libsvn_wc/db-test.c

(TESTING_DATA): Give present directories a depth and remove pristine data

from local additions that aren't copies.

* subversion/tests/libsvn_wc/entries-compat.c

(TESTING_DATA): Give present directories a depth; files a checksum and

remove pristine data from local additions.

* subversion/tests/libsvn_wc/op-depth-test.c

(insert_actual): When turning a directory in a file, really make it a file.

* subversion/tests/libsvn_wc/wc-queries-test.c

(test_verify_parsable): New function, verifying the check statements.

(test_funcs): Add test_verify_parsable.

* subversion/tests/libsvn_wc/wc-test-queries.sql

(STMT_ENSURE_EMPTY_PRISTINE): New statement.

(STMT_NODES_SET_FILE): Set checksum, remove depth.

* STATUS: Vote for r1542765, r1644158 and r1646785 groups.
* STATUS: Nominate r1532287.

* STATUS: Nominate very easy to review neon buildfix.
* build/generator/gen_vcnet_vcproj.py

(write): Don't prepend $(SolutionDir) before absolute paths.

Create backport branch for an issue building neon
Remove the '1.8.x-r1590751' branch, merged in r1660562.
Merge the 1.8.x-r1590751 branch:

* r1590751, r1660350

Use empty, rather than NULL, config if default is unreadable.

Justification:

svn SEGV reported by user.

Notes:

A test case is "HOME=/dev/null svn st".

Branch:

^/subversion/branches/1.8.x-r1590751

Votes:

+1: rhuijben, philip, julianfoad, danielsh

Merge the r1544302 group from trunk:

* r1544302, r1544303

Add HTTPd lock file configuration for testing against HTTPd 2.4+.

Justification:

Without this change, the davautocheck tests do not work on some

systems where HTTPd 2.4+ is the default; OSX 10.10 is one such case.

Notes:

As far as I'm concerned, this blocks 1.7.19 and 1.8.11 since the

tests won't run on a current version of a supported OS.

Votes:

+1: brane, breser, philip

* site/publish/docs/index.html:

Provide links to the 1.9.x pre-release generated documentation.

Update unreleased docs link to 1.10.0.

Update the NOTE about unreleased and prerelease docs.

Increment the trunk version number to 1.10.0-dev.

* subversion/include/svn_version.h: Increment version number.

* subversion/tests/cmdline/svntest/main.py (SVN_VER_MINOR),

build/run_tests.py (SVN_VER_MINOR):

Increment version number.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java

(NativeResources.init): Increment required library version.

* branches/1.9.x/STATUS: New file.
Create the 1.9.x release branch.
* INSTALL: Note that BDB is deprecated to discourage usage.

* INSTALL: Remove mentions of RPMs that we don't support anymore.