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

Changeset 1833600 is being indexed.

Add a couple more testcases for afl-x509. No further issues found.

* subversion/tests/afl/afl-x509-testcase/test2: New.

* subversion/tests/afl/afl-x509-testcase/test3: New.

* subversion/tests/cmdline/

(list_shelves): Don't check ordering, as shelf timestamps may not differ.

Merge r1816365 from trunk:

* r1816365

Duplicate proxy_password to the correct member of the new session, instead of

overwriting proxy_username.


Incorrect proxy settings can block user's access to the repo


+1: jamessan, stsp, philip

Change binary data tests to use varying file lengths.

This should make the tests work even though sleep_for_timestamps is disabled.

* STATUS: Vote for external pruning fix.
* STATUS: Vote/approve serf proxy password fix.
* subversion/tests/cmdline/

(unshelve_with_merge): Add a doc-string.

Shelving: Sleep for timestamps after 'unshelve'.

This should fix test failures we've been seeing particulary on a MacOSX buildbot

(as apparently an HFS+ filesystem has a coarse 1s timestamp resolution).

Found by: philip

* subversion/libsvn_client/shelf.c

(svn_client_shelf_apply): Sleep for timestamps.

Revert r1833512 (change binary data tests to use varying file lengths).
Change binary data tests to use varying file lengths.
* COMMITTERS: Move 'karolszk' from 'translators' to 'dormant'.

Karol emailed me today to say 'I am unable to continue [this work]'.

In the test suite: replace 'open().write()' with a 'with' construct.

The form 'with open() as f: f.write()' is nowadays recommended.

This may fix test failures we were seeing on MacOSX in

test 15 and perhaps test 12.

* subversion/tests/cmdline/*

Use 'with' form instead of 'open().write()'.

* subversion/tests/cmdline/svntest/

(file_write): Same, and also for ''.

(file_substitute): Same.

* subversion/tests/cmdline/svntest/

(Sandbox._ensure_authz): Same.

Merge r1829260 from trunk:

* r1829260

Revert r1751167, since it broke use of pre-generated Swig bindings in

release builds.


Fix build of pre-generated Swig bindings when swig is not installed


+1: jamessan, stsp, philip

Merge the r1830885 group from trunk:

* r1830885,r1831540

Ensure consistent use of $PYTHON during build and test.


Fixes potential build issues when multiple Python interpreters are

installed, and aids with Python 2 to 3 migration.


+1: jorton, rhuijben, philip

    • ?
Merge r1829241 from trunk:

* r1829241 Fix variable name with path to rdoc, broken in r1806570.


A regression in 1.10.0. Broke 'make install-swig-rb-doc'.


+1: julianfoad, stsp, philip

* STATUS: Vote/approve swig configure fix.
* STATUS: Vote/appprove path to python fix.
* STATUS: Vote/appprove path to rdoc fix.
* STATUS: Fix syntax to make happy.
* subversion/mod_dav_svn/repos.c

(open_stream): Return an error if a non-conforming client sends

a PUT before the corresponding CHECKOUT when attempting a v1

protocol commit. This is required for strict v1 compliance

and does not affect the v2 protocol.

Shelving: add tests for a binary file conflict.

* subversion/tests/cmdline/


unshelve_binary_mod_conflict): New tests.

(test_list): Run them.

Shelving: in the tests, tweak some test names and variable names.
Shelving: Add tests for merging a prop change, cleanly and with conflict.

* subversion/tests/cmdline/

(unshelve_with_merge): New, factored out...


unshelve_text_mod_conflict): ... from here.


unshelve_text_prop_conflict): New tests.

(test_list): Run them.

Shelving: Add tests for merging a text change, cleanly and with conflict.

* subversion/tests/cmdline/


unshelve_text_mod_conflict): New tests.

(test_list): Run them.

In the test suite, when displaying unexpected differences, don't hide

binary file contents.

* subversion/tests/cmdline/svntest/

(SVNTreeNode.print_script): Just print file content's repr() regardless of MIME-type.

Shelving: Test a little more thoroughly.

Verify also the contents of on-disk files and their versioned properties,

not just the status that 'svn status' shows.

* subversion/tests/cmdline/


check_wc_state): New.



unshelve_refuses_if_conflicts): Use them.

Shelving: Add a test for refusing to shelve a conflict.

A follow-up to r1833141.

* subversion/tests/cmdline/

(refuse_to_shelve_conflict): New test.

(test_list): Run it.

Shelving: Improve 'svn help shelve'.

* subversion/svn/svn.c

(svn_cl__cmd_table): For 'shelve', better describe the supported kinds of change.

Shelving: Detect and refuse to shelve an unversioned tree-conflicted victim path.

Previously a path with this status was silently skipped.

* subversion/libsvn_client/shelf.c

(write_changes_visitor): Detect and refuse all conflicts.

[A test was added later in r1833168.]

Shelving: better reporting of shelved and not-shelved changes.

* subversion/include/svn_client.h,


(svn_client_shelf_save_new_version3): New.

(svn_client_shelf_save_new_version2): Deprecate.

* subversion/svn/shelf-cmd.c

Use callbacks to report shelved and not-shelved paths.