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 2013/10/22 18:44:57 UTC
svn commit: r1534698 - /subversion/branches/1.8.x/STATUS
Author: philip
Date: Tue Oct 22 16:44:56 2013
New Revision: 1534698
URL: http://svn.apache.org/r1534698
Log:
* STATUS: Vote/approve issue 4422 fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1534698&r1=1534697&r2=1534698&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Oct 22 16:44:56 2013
@@ -71,14 +71,6 @@ Candidate changes:
detection of BDB (via db.h) and even while debugging a
maintainer build of Subversion a release BDB works fine)
- * r1520065, r1520745
- Resolve a user triggerable assertion when during an update a file external
- is being replaced by a server excluded (aka absent) node.
- Justification:
- Quite a few reports of this assertion on the users@s.a.o list since 1.7.0.
- Votes:
- +1: rhuijben, breser
-
* r1524145
Make the 'm' conflict prompt option run external merge tool if configured.
Justification:
@@ -124,3 +116,11 @@ Approved changes:
added by that revision.
Votes:
+1: breser, rhuijben, philip
+
+ * r1520065, r1520745
+ Resolve a user triggerable assertion when during an update a file external
+ is being replaced by a server excluded (aka absent) node. Issue 4422.
+ Justification:
+ Quite a few reports of this assertion on the users@s.a.o list since 1.7.0.
+ Votes:
+ +1: rhuijben, breser, philip