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

Changeset 1863300 is being indexed.

Merge the 1.10.x-r1855419 branch:

* r1855419

Fix conflict resolver bug where local and incoming edits got swapped.

Justification:

Bug breaks text conflict resolution.

User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml

Branch:

^/subversion/branches/1.10.x-r1855419

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge the r1854072 group from trunk:

* r1854072, r1854074, r1854216

Fix issue #4806: Remove on-disk trees with read-only directories in them.

Justification:

Fixes an edge case in our tree removal code. If we clear read-only

permissions on files in order to remove them, we should do the same for

directories.

Votes:

+1: brane, stsp

  1. … 3 more files in changeset.
Merge r1853483 from trunk:

* r1853483

Fix #4760 "Missing children when svnadmin dump --include/exclude converts

copy-dir to add-dir".

Justification:

The new feature was broken.

Votes:

+1: julianfoad, stsp

  1. … 3 more files in changeset.
Merge r1853450 from trunk:

* r1853450

Enable 'incoming_move_file_merge' option only if local change is file edit.

Justification:

Conflict resolver misbehaves when it runs into move vs move conflicts.

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge r1852436 from trunk:

* r1852436

Make 'svn update' not record a tree conflict when deleting an unmodified

directory which happens to contain unversioned items.

Justification:

Unnecessary tree conflict due to e.g. build artifacts on disk.

User complained: https://svn.haxx.se/users/archive-2019-01/0060.shtml

IRC discussion:

https://colabti.org/irclogger/irclogger_log/svn-dev?date=2019-01-29#l10

Votes:

+1: stsp

  1. … 4 more files in changeset.
Merge r1852013 from trunk:

* r1852013

Fix issue #4804: avoid test failures just because some SQLite compile-time

feature was enabled that changes its query plan descriptions.

Justification:

Reported build failure on Gentoo Linux, see:

https://bugs.gentoo.org/605438

Votes:

+1: brane, stsp

  1. … 2 more files in changeset.
Merge r1851920 from trunk:

* r1851920

Remove a useless common ancestor search from the conflict resolver.

Justification:

Current behaviour is inefficient and could lead to dubious conflicts.

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge r1850651 from trunk:

* r1850651

Fix a use-after-free in mod_dav_svn's logging of FS warnings.

Justification:

Lots of crashes on OpenBSD during 'make check' with HTTPD 2.4.

See https://svn.haxx.se/dev/archive-2018-12/0137.shtml

Votes:

+1: stsp, brane

  1. … 2 more files in changeset.
Merge r1845212 from trunk:

* r1845212

Silence a deprecation warning from amalgamated SQLite on macOS.

Justification:

Keeps the macOS warnings checker buildslave clean.

Votes:

+1: brane, stsp

  1. … 2 more files in changeset.
Mark all non-contentious nominated backports as approved, following our

silence-implies-consent decision.

* STATUS: Vote for r1860936 group.

  1. … 2 more files in changeset.
* STATUS: Nominate r1860936, r1860951, r1860958.
* STATUS: Nominate VS2019 build support.
* STATUS: Nominate r1857391
* STATUS: Nominate r1857367.

* STATUS: Nominate r1855419.

Merge r1853761 from trunk:

* r1853761

Fix an "unused static function" warning in non-maintainer mode builds.

Justification:

Requested on dev@. Fixes a compiler warning.

Votes:

+1: danielsh, brane, stsp

  1. … 2 more files in changeset.
Merge the r1851676 group from trunk:

* r1851676, r1851687, r1851791

Allow the use of empty groups in authz rules.

Justification:

Fixes regression from 1.9.x. Does not affect authz file semantics.

Notes:

- r1851676 adds a regression test.

- r1851687 fixes the bug and extends the test.

- r1851791 refers to issue #4802.

Votes:

+1: brane, julianfoad, stsp

  1. … 3 more files in changeset.
Merge the r1847598 group from trunk:

* r1847598, r1847697, r1847922, r1847924, r1847946

Fix SVN-4793: authz rights from inverted access selectors were not

accounted for at the global level, causing wrong authz check results.

Justification:

Fixes a regression in the new authz parser and resolver.

Notes:

- r1847598 and r1847697 are only test suite changes, but by including

them we can avoids creating a backport branch.

- r1847924 and r1847946 are tiny but IMO relevant comment tweaks.

Votes:

+1: brane, stefan2, stsp

  1. … 6 more files in changeset.
* STATUS: Vote for issue #4806 fix.

* STATUS: Vote for issue #4760 fix.

* STATUS: Vote for r1853761, approving.

* STATUS: Vote for issue #4804 fix.

* STATUS: Vote for r1851676 group, approving.

* STATUS: Vote for issue #4793 fix, approving.

* STATUS: Vote for r1845212.

* branches/1.10.x/STATUS,

branches/1.11.x/STATUS: Add r1854216 to the r1854072 group.

  1. … 1 more file in changeset.
Vote for the r1853761 backport proposal.
  1. … 2 more files in changeset.
* branches/1.9.x/STATUS,

branches/1.10.x/STATUS,

branches/1.11.x/STATUS: Propose r1854072 et al.

  1. … 2 more files in changeset.
* STATUS: Nominate r1853761.