You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2018/07/27 16:17:42 UTC
svn commit: r1836839 - /subversion/branches/1.10.x/STATUS
Author: philip
Date: Fri Jul 27 16:17:42 2018
New Revision: 1836839
URL: http://svn.apache.org/viewvc?rev=1836839&view=rev
Log:
* STATUS: Vote/approve issue 4739 fix.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1836839&r1=1836838&r2=1836839&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jul 27 16:17:42 2018
@@ -15,19 +15,6 @@ Status of 1.10.3:
Candidate changes:
==================
- * r1830083, r1833864, r1833866
- Fix issue #4739, "Accept incoming deletion" option doing nothing
- for a locally deleted file
- Justification:
- Fixes undesirable conflict resolver behaviour.
- Notes:
- r1830083 adds a regression test
- r1833864 fixes the issue
- r1833866 is a small follow-up fix
- Issue #4744 fix should be merged after this to avoid merge conflicts.
- Votes:
- +1: stsp, jcorvel
-
* r1833895, r1833897, r1833899, r1833901
Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"
Justification:
@@ -76,3 +63,16 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1830083, r1833864, r1833866
+ Fix issue #4739, "Accept incoming deletion" option doing nothing
+ for a locally deleted file
+ Justification:
+ Fixes undesirable conflict resolver behaviour.
+ Notes:
+ r1830083 adds a regression test
+ r1833864 fixes the issue
+ r1833866 is a small follow-up fix
+ Issue #4744 fix should be merged after this to avoid merge conflicts.
+ Votes:
+ +1: stsp, jcorvel, philip