Author: julianfoad
Date: Mon Jun 3 22:25:30 2013
New Revision: 1489211
URL: http://svn.apache.org/r1489211
Log:
* STATUS: Propose r1489203 - crash in automatic merge API.
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=1489211&r1=1489210&r2=1489211&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jun 3 22:25:30 2013
@@ -76,6 +76,18 @@ Candidate changes:
Votes:
+1: cmpilato, gstein
+ * 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
+
Veto-blocked changes:
=====================
