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

Changeset 1879221 is being indexed.

* buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd

Explicitly run swig python tests with python2 for now.

* STATUS: Add nomination.
* STATUS: Add nomination.
* STATUS: Add nomination.
Fix invalid escape sequence in working copy queries which causes

upgrades from Subversion 1.7 working copies to fail with recent

SQLite versions (>= 3.29.0).

* subversion/libsvn_wc/wc-metadata.sql

(STMT_UPGRADE_TO_30): Use '' to delimit values and "" to escape column names.

Fix issue #4859 "Merge removing a folder with non-inheritable mergeinfo ->

E155023: can't set properties: invalid status for updating properties".

The code was attempting to set mergeinfo on a path that is being deleted by

the merge. This happened only in certain unusual cases such as when

deleting a folder that had non-inheritable mergeinfo and had children.

This patch fixes the problem by removing the 'children_with_mergeinfo'

entries for sub-paths of a deleted folder.

* subversion/libsvn_client/merge.c

(merge_cmd_baton_t): Allow modifying 'children_with_mergeinfo'.

(record_update_delete): Remove from 'children_with_mergeinfo' all paths

in the subtree.

* subversion/tests/cmdline/

(merge_deleted_folder_with_mergeinfo): Remove 'XFail'.

(merge_deleted_folder_with_mergeinfo_2): New test.

(test_list): Add the new test.

Add a test for issue #4859: Merge removing a folder with non-inheritable


The merge fails like this:

> svn merge -c4 ^/branch_A .../A

> --- Merging r4 into '.../A':

> D .../A/D

> svn: E155023: Can't set properties on '/.../A/D/gamma':

> invalid status for updating properties.

* subversion/tests/cmdline/

(merge_deleted_folder_with_mergeinfo): New test.

(test_list): Run it.

* STATUS: Update r1878909 proposal.
* STATUS: Update r1878909 proposal.
Follow up to r1878909: Fix test description and ignore build artefacts.

* build.conf (filesize-test): Fix test description.

* subversion/tests/client: Add svn:ignore property.

* build.conf: Add filesize-test to ALL_TESTS to allow testing on Windows.
* STATUS: Propose r1878909.
Fix a number of thinkos in human-readable file size formatting.

* subversion/svn/filesize.c

(format_size): Be smarter about predicting floating-point rounding to

decide whether to show decimal places or not.

(get_base2_unit_file_size): Fix human-readable size order calculation.

(get_base10_unit_file_size): Likewise.

* build.conf (filesize-test): New test suite.

(private-includes): Add subversion/svn/filesize.c for filesize-test.

* subversion/tests/client/filesize-test.c: New.

Found by: Tobias Bading <tbading{_AT_}>

Patch by: me

    • ?
* tools/backup/

Remove unnecessary semicolons.

Make the script work with Python 3.

* tools/backup/

Use functools.cmp_to_key() for sorting conversions, and decode the

output from svnlook.

Patch by: Petyovský Petr <petyovsky{_AT_}>

* docs/release-notes/index.html

(#release-notes-list): Use an en dash, as the other entries do.

* docs/release-notes/index.html

(#release-notes-list): Add release date for 1.14

* upcoming.part.html: Automatically regenerated
Merge the r1876707 group from trunk:

* r1876707, r1876734, r1877318, r1877712, r1878141, r1878142, r1878143,


Various fixes for making the test suite run correctly with Python 3 on



Our test suite should test Subversion correctly also on Windows with

Python 3


+1: futatuki, jcorvel, stsp

* STATUS: Nominate r1878413. Remove per SWIG bindings checked files on release mode.

The .swig_pl_checked, .swig_py_checked, .swig_rb_checked files are

created by 'make -f autogen-swig' if this script

run on release mode, however they should not exist before users run

the configure script.


Remove .swig_pl_checked, .swig_py_checked, and .swig_rb_checked files

after generating SWIG language bindings source files when the script

runs on release mode.

* STATUS: Vote for r1876707 group, approving.

* STATUS: Vote for r1876662 and r1876906.

configure: Add new option to specify path to swig bindings targets

Before this commit, it was not possible to use distinct Python

installations for the build system and test suite on the one hand,

and for building language bindings against on the other hand.

So we introduce new variable "SWIG_PY_PYTHON" for a target of

the SWIG Python bindings and a configure option to specify it.

Also, for the symmetry we introduce "SWIG_PL_PERL" and

"SWIG_RB_RUBY" for the Perl and Ruby SWIG bindings, and options

to specify them.

* ():

- Use variables "SWIG_PL_PERL", "SWIG_PY_PYTHON", "SWIG_RB_RUBY" for

targets of the SWIG Perl, Python, Ruby bindings instead of "PERL",


- Introduce --with-swig-perl, --with-swig-python, --with-swig-ruby

options for setting variables "SWIG_PL_PERL", "SWIG_PY_PYTHON",


*, build/ac-macros/swig.m4 ():

Use variables "SWIG_PL_PERL", "SWIG_PY_PYTHON", "SWIG_RB_RUBY" for

targets of the SWIG Perl, Python, Ruby bindings instead of "PERL",


* subversion/bindings/swig/INSTALL


- Describe how to specify the path to the target language interpreters

with the new options, instead of using environment variables.

- Fix the name of glue libraries.

Review by: danielsh

* STATUS: Nominate r1876662.
* download.html: Use the same wording as in the download link.
* download.html: Don't link to the root KEYS file, as it no longer

gets updated.

In 1.14.0 announcement, add link to press release

* site/publish/index.html (#news-20200527),

site/publish/news.html (#news-20200527): Add link to press release

* site/publish/index.html (news): Remove older news items about 1.13.0 and

1.14.0-rc2, obsolete because 1.14.0 is released and 1.13.0 is EOL.

* docs/community-guide/releasing.part.html

(#release-announce): Document the potential for arbitrary, anonymous

rejections by announce-owner@a.o, in order to prevent RM's from

experiencing a negative surprise.

Patch by: stsp