branches

Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1877960 from trunk:

* r1877960

INSTALL (I.C.12): Add Note that non-release mode is required for building

SWIG Python 2 bindings.

Justification:

We've not entirely dropped Python 2 bindings support on 1.14.x yet

Votes:

+1: futatuki, stsp, rhuijben

* STATUS: Edit an entry in such a way as to avoid triggering

a backport.pl syntax error.

.

This should allow this entry to be auto-merged later tonight.

The error is [copied from the conflicts bot, but the merges bot should be

seeing it too]:

Too many bullets in * r1877960 at ./.svn/backport.pl line 1215, <STATUS> chunk 11.

* STATUS: Nominate the fsfs part of r1880374.
On the 1.14.x-r1880374-fsfs branch:

Merge the subversion/libsvn_fs_fs part of r1880374 from trunk.

  1. ./1.14.x-r1880374-fsfs/subversion/libsvn_fs_fs
Create the 1.14.x-r1880374-fsfs backport branch.
* STATUS: Vote +1 on r1878997 group and r1880192.

* STATUS: Nominate r1880192.
* STATUS: Add a 'Depends' to r1880192.
* STATUS: Nominate r1880192.
* STATUS: Nominate issue #4859 (merge bug fix).
* STATUS: Nominate issue #4859 (merge bug fix).
Merge r1879959 from trunk.
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.

Justification:

Causes user-visible errors.

Note:

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

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

Votes:

+1: rhuijben, danielsh, jamessan

    • ?
    ./1.14.x/subversion/libsvn_wc/wc-metadata.sql
Merge the r1878909 group from trunk:

* r1878909, r1878918, r1878950

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

Justification:

Fixes wrong output and an assertion failure in debug mode.

Votes:

+1: brane, rhuijben, jamessan

Merge r1878413 from trunk:

* r1878413

autogen.sh: Remove per SWIG bindings checked files on release mode.

Justification:

The release tarballs should not contain .swig_*_checked files

Votes:

+1: futatuki, rhuijben, jamessan

Merge r1876410 from trunk:

* r1876410

Fix the .editorconfig stanza for Makefile's.

Justification:

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

off this stabilization branch.

Votes:

+1: danielsh, stsp, jamessan

* STATUS:

Vote +1 on r1876410, approving.

Vote +1 on r1878413, approving.

Vote +1 on the r1878909 group, approving.

Vote +1 on r1879198, approving.

Merge r1878997, r1879192, r1879474 from trunk.
Create a backport branch.
Merge r1876906 from trunk:

* r1876906

Make gen-make.py --debug work with Python 3

Justification:

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

on Windows.

Votes:

+1: jcorvel, stsp, rhuijben

Merge r1876662 from trunk:

* r1876662

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

passed.

Justification:

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

the release tarball

Votes:

+1: futatuki, stsp, rhuijben

* 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.
* STATUS: Add nomination.
* STATUS: Add nomination.
* STATUS: Add nomination.
* STATUS: Update r1878909 proposal.