You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/04/11 18:09:30 UTC
svn commit: r1586708 - /subversion/branches/1.8.x/STATUS
Author: julianfoad
Date: Fri Apr 11 16:09:29 2014
New Revision: 1586708
URL: http://svn.apache.org/r1586708
Log:
* STATUS: Vote for the r1577812 group: segfault in 'svn merge --force'.
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=1586708&r1=1586707&r2=1586708&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 11 16:09:29 2014
@@ -201,21 +201,6 @@ Candidate changes:
Votes:
+1: rhuijben
- * r1577812, r1577813, r1579429
- Resolve a segfault when 'svn merge --force' merges a directory delete
- Justification:
- Even though this merge flag is not recommended, it shouldn't cause a
- segfault.
- Notes:
- r1577812 contains the actual fix and a regression test. r1577813 is
- a minor improvement. A branch is necessary because a comment right above
- the fix contained a typo that was fixed on trunk in a huge commit of many
- typo fixes.
- Branch:
- ^/subversion/branches/1.8.x-r1577812
- Votes:
- +1: philip, rhuijben
-
* r1578273, r1578311, r1578326
Make svn_ra_get_locks() and svn_ra_get_lock() report not locked nodes
with a NULL svn_lock_t *, as documented.
@@ -360,6 +345,21 @@ Veto-blocked changes:
Approved changes:
=================
+ * r1577812, r1577813, r1579429
+ Resolve a segfault when 'svn merge --force' merges a directory delete
+ Justification:
+ Even though this merge flag is not recommended, it shouldn't cause a
+ segfault.
+ Notes:
+ r1577812 contains the actual fix and a regression test. r1577813 is
+ a minor improvement. A branch is necessary because a comment right above
+ the fix contained a typo that was fixed on trunk in a huge commit of many
+ typo fixes.
+ Branch:
+ ^/subversion/branches/1.8.x-r1577812
+ Votes:
+ +1: philip, rhuijben, julianfoad
+
* r1577294
Make interactive conflict resolver behave as designed.
Justification: