Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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 r1736432 from trunk:

* r1736432

Fix failure in update_tests.py#76 with SVNPathAuthz short_circuit.

Justification:

Tests should not fail.

Votes:

+1: kotkov, ivan, rhuijben

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

* r1702247

Resolve segfault incoming delete of tree containing switched paths

Justification:

Segfault. User reported.

Votes:

+1: rhuijben, ivan, stefan2

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

* r1701838, r1702203

Fix attempt to use uninitialized svn_wc__db_install_data_t pointer on

error in working copy update editor. Reproduction script:

$ svn co URL wc --depth=empty

$ rm -rf wc/.svn/tmp

$ svn up wc --set-depth=infinity

Justification:

Crash. Reported multiple times using TortoiseSVN crash reporter tool.

Depends:

Depends on the r1702198, r1702200 backport due conflicts in

update_tests.py.

Votes:

+1: rhuijben, ivan, kotkov

  1. … 4 more files in changeset.
Merge the r1702198 group from trunk:

* r1702198, r1702200

Resolve segfault while updating already conflicted tree

Justification:

Segfault. User reported.

Votes:

+1: rhuijben, ivan, kotkov

  1. … 3 more files in changeset.
On the 1.9.x branch: Catch-up merge from trunk@1662901.

* STATUS: Closed for the Beta release.

Removed pending backport nominations, since they're all

included in the catch-up merge.

  1. … 159 more files in changeset.