On the inheritable-props branch: Sync with ^/subversion/trunk throughr1389356.Resolve some minor conflicts with the incoming bump to WC format 30 (seer1387742). We had already made that bump on this branch to support a schemachange required for iprops (see r1376154 and r1376924). With this sync, thelatter change is now part of the bump to format 31.
On the inheritable-props branch: Move the pending format 31 upgrade stuffsinto the format 30 upgrade bump.* subversion/libsvn_wc/upgrade.c (STMT_UPGRADE_TO_30): Roll the pending format 31 "nice to haves" into the format 30 bump. (STMT_UPGRADE_TO_31): Deleted, now part of STMT_UPGRADE_TO_30. (STMT_UPGRADE_31_SELECT_CONFLICT_SEPARATE): Rename to... (STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE): ...this. (STMT_UPGRADE_31_SET_CONFLICT): Rename to... (STMT_UPGRADE_30_SET_CONFLICT): ...this.* subversion/libsvn_wc/wc-metadata.sql (bump_to_31): Delete and roll into bump_to_30. (svn_wc__upgrade_sdb): Remove execution of bump_to_31.
On the inheritable-props branch: Bump WC format and handle upgrades.Manual and auto WC upgrades will now bump the WC format to 30, add theinherited_props column to the NODES table, and flag the WC roots thatrequire iprop caches. Upgrade is still a disconnected operation however,so the caches are not populated until the next update.* subversion/libsvn_wc/upgrade.c (bump_to_30): Renamed the previous function here to bump_to_31 (it isn't currently used). The "new" bump_to_30 adds the inherited_props column to the NODES table and then sets the inherited_props of each WC root, excluding roots mapped to the repos root, to and empty array. (bump_to_31): The old bump_to_30. (svn_wc__upgrade_sdb): Handle the bump to 30.* subversion/libsvn_wc/wc-metadata.sql (CREATE TABLE NODES): Move the inherited_props column to the rightmost column so the ordering is the same for a newly created format 30 WC as it is for one upgraded to 30. (STMT_UPGRADE_TO_30): New, replaces the old STMT_UPGRADE_TO_30 which is renamed to... (STMT_UPGRADE_TO_31): ...this. (STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE): Renamed to... (STMT_UPGRADE_31_SELECT_CONFLICT_SEPARATE): ...this. (STMT_UPGRADE_30_SET_CONFLICT): Renamed to... (STMT_UPGRADE_TO_31): ...this.* subversion/libsvn_wc/wc-queries.sql (STMT_SELECT_WCROOT_NODES): New.* subversion/libsvn_wc/wc.h (SVN_WC__VERSION): Bump from 29 to 30.* subversion/tests/libsvn_wc/db-test.c (TESTING_DATA): Account for new position of inherited_props column in the NODES table.* subversion/tests/libsvn_wc/entries-compat.c (TESTING_DATA, M_TESTING_DATA): Account for new position of inherited_props column in the NODES table.