Checkout Tools
  • last updated 8 hours ago
Constraints: committers
Constraints: files
Constraints: dates
* upcoming.part.html: Automatically regenerated
Merge r1879198 from trunk:

* r1879198

Fix an invalid quoting in working copy upgrade system that only works

because SQLite automatically fixed this. More recent SQLite functions

will signal an error when deprecated features are disabled.


Causes user-visible errors.


This filechange by itself doesn't trigger a change that make will

handle. So make sure you recompile the sql queries for testing.


+1: rhuijben, danielsh, jamessan

Merge the r1878909 group from trunk:

* r1878909, r1878918, r1878950

Fix a number of thinkos in human-readable file size formatting.


Fixes wrong output and an assertion failure in debug mode.


+1: brane, rhuijben, jamessan

    • ?
Merge r1878413 from trunk:

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


The release tarballs should not contain .swig_*_checked files


+1: futatuki, rhuijben, jamessan

Merge r1876410 from trunk:

* r1876410

Fix the .editorconfig stanza for Makefile's.


Make $EDITOR do the right thing on any backport branches we may create

off this stabilization branch.


+1: danielsh, stsp, jamessan


Vote +1 on r1876410, approving.

Vote +1 on r1878413, approving.

Vote +1 on the r1878909 group, approving.

Vote +1 on r1879198, approving.

* publish/.message-ids.tsv: Automatically regenerated.
In 'staging': catch-up merge from 'publish'
  1. … 4 more files in changeset.
Remove references to from website.

* docs/community-guide/general.html

Participating in the community: Changed link to issue tracker to Jira

* docs/community-guide/releasing.html

Release numbering, Alpha and Beta: Replaced broken link to

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

How partial commit access is granted: Replaced broken link to

Patch by: Daniel Sahlberg <daniel.l.sahlberg{_AT_}>

Merge r1878997, r1879192, r1879474 from trunk.
Create a backport branch.
Remove an unused field in merge code.

There is no code anywhere that sets this flag. There was in svn 1.6, but

not in svn 1.7 and later.

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

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

* subversion/libsvn_client/mergeinfo.h

(svn_client__merge_path_t): Remove 'scheduled_for_deletion' field.

* subversion/libsvn_client/merge.c

(remove_absent_children): Remove reference to it.

* upcoming.part.html: Automatically regenerated
Merge r1876906 from trunk:

* r1876906

Make --debug work with Python 3


We should also be able to build in Debug configuration with Python 3

on Windows.


+1: jcorvel, stsp, rhuijben

Merge r1876662 from trunk:

* r1876662

Avoid check for SWIG version for Python bindings when --without-swig is



SWIG python bindings should be able to be built without SWIG when we use

the release tarball


+1: futatuki, stsp, rhuijben

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

(#releasing-announce): Add a step to update the "Status of this branch"

comments at the top of STATUS files.

* STATUS: Cast some votes.
* STATUS: Cast some votes. Approve a few python changes.
* 1.10.x/STATUS (r1879198),

1.14.x/STATUS (r1879198): Merge two nominations of the same revision.

* STATUS: Nominate r1879198.
* STATUS: Nominate r1879198.
* buildbot/slaves/win32-SharpSvn/svntest-test.cmd

Call the default python interpreter on the tests.

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