subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1489478 - /subversion/branches/1.8.x/STATUS
Date Tue, 04 Jun 2013 15:34:37 GMT
Author: pburba
Date: Tue Jun  4 15:34:36 2013
New Revision: 1489478

URL: http://svn.apache.org/r1489478
Log:
* STATUS: Vote and approve r1489203.


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=1489478&r1=1489477&r2=1489478&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jun  4 15:34:36 2013
@@ -57,18 +57,6 @@ Candidate changes:
    Votes:
      +1: philip, danielsh
 
- * r1489203
-   Fix a crash when the automatic merge API is called with unrelated source
-   and target branches, other than by 'svn' which does an ancestry check
-   before calling it.  Also affected svn_client_get_merging_summary().
-   Justification:
-     It's a crash. The fix is a straightforward check.
-   Notes:
-     Tested as in the email: by temporarily removing the check at
-     merge-cmd.c:109 and trying a mismatched automatic merge.
-   Votes:
-     +1: julianfoad, ivan
-
 Veto-blocked changes:
 =====================
 
@@ -89,6 +77,18 @@ Approved changes:
    Votes:
      +1: cmpilato, gstein, ivan
 
+ * r1489203
+   Fix a crash when the automatic merge API is called with unrelated source
+   and target branches, other than by 'svn' which does an ancestry check
+   before calling it.  Also affected svn_client_get_merging_summary().
+   Justification:
+     It's a crash. The fix is a straightforward check.
+   Notes:
+     Tested as in the email: by temporarily removing the check at
+     merge-cmd.c:109 and trying a mismatched automatic merge.
+   Votes:
+     +1: julianfoad, ivan, pburba
+
 # 1.8.0-rc2 is being voted on currently and as such 1.8.0 is in the soak phase.
 # Changes that are not intended for 1.8.0 should not be placed here and changes
 # that would restart the soak should not be added unless they are resolving



Mime
View raw message