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 2011/08/26 11:56:51 UTC
svn commit: r1162052 - /subversion/branches/1.7.x/STATUS
Author: philip
Date: Fri Aug 26 09:56:51 2011
New Revision: 1162052
URL: http://svn.apache.org/viewvc?rev=1162052&view=rev
Log:
* STATUS: Vote/approve r1162024/r1162033
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1162052&r1=1162051&r2=1162052&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug 26 09:56:51 2011
@@ -74,20 +74,6 @@ Candidate changes:
Votes:
+1: pburba
- * r1162024, r1162033
- Resolve segfault on retrieving svn_wc_entry_t or calling 'svn info' on a
- binary conflict.
- Justification:
- svn info shouldn't crash on a simple (binary) conflict.
- Notes:
- r1162024 is a test reproducing the segfault. r1162033 fixes both issues
- and possibly a few harder to reproduce variants.
- There is a trivial text conflict on the blank line above the newly added
- test. An empty line was removed in r1151015, theirs-on-conflict handles
- this properly.
- Votes:
- +1: rhuijben, danielsh
-
Veto-blocked changes:
=====================
@@ -101,3 +87,16 @@ Approved changes:
Votes:
+1: stsp, rhuijben, danielsh
+ * r1162024, r1162033
+ Resolve segfault on retrieving svn_wc_entry_t or calling 'svn info' on a
+ binary conflict.
+ Justification:
+ svn info shouldn't crash on a simple (binary) conflict.
+ Notes:
+ r1162024 is a test reproducing the segfault. r1162033 fixes both issues
+ and possibly a few harder to reproduce variants.
+ There is a trivial text conflict on the blank line above the newly added
+ test. An empty line was removed in r1151015, theirs-on-conflict handles
+ this properly.
+ Votes:
+ +1: rhuijben, danielsh, philip