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

Changeset 1660594 is being indexed.

* 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


(svn_wc__db_op_copy_symlink): Calulate moved_to like the other operations.

Don't set changed* and properties on local


* subversion/tests/cmdline/

(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_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/

(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.


svn SEGV reported by user.


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




+1: rhuijben, philip, julianfoad, danielsh

Merge the r1544302 group from trunk:

* r1544302, r1544303

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


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.


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.


+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/ (SVN_VER_MINOR),

build/ (SVN_VER_MINOR):

Increment version number.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/

(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.


Remove some outdated Windows specifics.

Building zlib with masm support will give you invalid data, so remove

from file.

* INSTALL: This file is out-of-date in lots of places, fix a few.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_file_revs2): Also perform the capability check if start revision

specifies HEAD. Don't use the log fallback when asking for merged

revisions, as that isn't going to work.

* subversion/tests/cmdline/README: Update SASL instructions.

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

(TESTING_DATA): Remove unneeded values to make this testset

compatible with the verification code.

Update the test data in db-test.c to at least pass the current static

validations. Add two missing intermediate directories, and remove

values that shouldn't be set.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Add column for op-depth value to queries.

* subversion/libsvn_wc/wc_db_wcroot.c

(verify_sqlite): Update usage.

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

(TESTING_DATA): Tweak values to set columns NULL that should be NULL.

(test_children): Update expected results.

(test_working_info): Update expected results.

Make the pre-1.7 import code not write values into wc.db NODES columns that the

presence implies shouldn't be written.

* subversion/libsvn_wc/entries.c

(includes): Add token-map.h.

(insert_node): Don't write values that shouldn't be set.

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

(test_db_make_copy): Fix invalid static test data. base-deletes don't

have repository locations.

Stop storing values in columns of NODES rows where their presence implies that

they shouldn't have those values, in the few code paths that still added them.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Extend verifications.

* subversion/libsvn_wc/wc_db.c


insert_working_node): Stop storing depth, properties when the

node has not a present status.

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

(STMT_INSERT_NODE): Don't add values invalid for this presence.

Rename an op-depth test called after its previous wc_db name to its

current name.

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

(temp_op_make_copy): Fold into its only caller.

(test_temp_op_make_copy): Rename to...

(test_db_make_copy):... this and integrate temp_op_make_copy.

(test_funcs): Update reference.

* STATUS: Vote. Wrap to 80 columns.