You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2022/11/23 11:17:42 UTC
svn commit: r1905480 - in /subversion/branches/pristines-on-demand-on-mwf: ./ subversion/libsvn_wc/wc_db.h subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/svn_test_main.c
Author: kotkov
Date: Wed Nov 23 11:17:42 2022
New Revision: 1905480
URL: http://svn.apache.org/viewvc?rev=1905480&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905479,
resolving conflicts in depth_tests.py and patch_tests.py.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/svn_test_main.c
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1905437-1905479
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h?rev=1905480&r1=1905479&r2=1905480&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db.h Wed Nov 23 11:17:42 2022
@@ -2274,25 +2274,6 @@ svn_wc__db_read_inherited_props(apr_arra
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Read a BASE node's inherited property information.
-
- Set *IPROPS to to a depth-first ordered array of
- svn_prop_inherited_item_t * structures representing the cached
- inherited properties for the BASE node at LOCAL_ABSPATH.
-
- If no cached properties are found, then set *IPROPS to NULL.
- If LOCAL_ABSPATH represents the root of the repository, then set
- *IPROPS to an empty array.
-
- Allocate *IPROPS in RESULT_POOL, use SCRATCH_POOL for temporary
- allocations. */
-svn_error_t *
-svn_wc__db_read_cached_iprops(apr_array_header_t **iprops,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Find BASE nodes with cached inherited properties.
Set *IPROPS_PATHS to a hash mapping const char * absolute working copy
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py?rev=1905480&r1=1905479&r2=1905480&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py Wed Nov 23 11:17:42 2022
@@ -2781,14 +2781,12 @@ def revert_depth_files(sbox):
sbox.build(read_only = True)
- expected_paths = [sbox.ospath('A/mu')]
-
# Apply an unrelated delete one level to deep
sbox.simple_rm('A/D/gamma')
sbox.simple_rm('A/mu')
# Expect reversion of just 'mu'
- svntest.actions.run_and_verify_revert(expected_paths,
+ svntest.actions.run_and_verify_revert([sbox.ospath('A/mu')],
'--depth=immediates', sbox.ospath('A'))
# Apply an unrelated directory delete
@@ -2796,7 +2794,7 @@ def revert_depth_files(sbox):
sbox.simple_rm('A/mu')
# Expect reversion of just 'mu'
- svntest.actions.run_and_verify_revert(expected_paths,
+ svntest.actions.run_and_verify_revert([sbox.ospath('A/mu')],
'--depth=files', sbox.ospath('A'))
@Issue(4257)
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py?rev=1905480&r1=1905479&r2=1905480&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py Wed Nov 23 11:17:42 2022
@@ -1662,8 +1662,7 @@ def patch_no_svn_eol_style(sbox):
[], True, True,
keep_eol_style=True)
- expected_paths = [mu_path]
- svntest.actions.run_and_verify_revert(expected_paths,
+ svntest.actions.run_and_verify_revert([mu_path],
'-R', wc_dir)
def patch_with_svn_eol_style(sbox):
@@ -1779,8 +1778,7 @@ def patch_with_svn_eol_style(sbox):
1, # dry-run
keep_eol_style=True)
- expected_paths = [mu_path]
- svntest.actions.run_and_verify_revert(expected_paths,
+ svntest.actions.run_and_verify_revert([mu_path],
'-R', wc_dir)
def patch_with_svn_eol_style_uncommitted(sbox):
@@ -1890,8 +1888,7 @@ def patch_with_svn_eol_style_uncommitted
1, # dry-run
keep_eol_style=True)
- expected_paths = [mu_path]
- svntest.actions.run_and_verify_revert(expected_paths,
+ svntest.actions.run_and_verify_revert([mu_path],
'-R', wc_dir)
def patch_with_ignore_whitespace(sbox):
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/svn_test_main.c?rev=1905480&r1=1905479&r2=1905480&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/svn_test_main.c Wed Nov 23 11:17:42 2022
@@ -811,7 +811,6 @@ svn_test_main(int argc, const char *argv
svn_test_opts_t opts = { NULL };
opts.fs_type = DEFAULT_FS_TYPE;
- opts.wc_format_version = svn_wc__min_supported_format_version();
opts.store_pristine = svn_tristate_unknown;
/* Initialize APR (Apache pools) */