Author: stsp
Date: Tue Jan 29 12:16:27 2019
New Revision: 1852437
URL: http://svn.apache.org/viewvc?rev=1852437&view=rev
Log:
* STATUS: Nominate r1852436.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1852437&r1=1852436&r2=1852437&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Tue Jan 29 12:16:27 2019
@@ -4,8 +4,7 @@
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
-This file tracks the status of releases in the 1.11.x line.
-
+This file tracks the status of releases in the 1.11.x line.
See
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
@@ -84,6 +83,17 @@ Candidate changes:
Votes:
+1: brane
+ * 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
+
Veto-blocked changes:
=====================
