Checkout Tools
  • last updated 6 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.
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.