You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2011/09/02 19:34:23 UTC

svn commit: r1164650 - /subversion/branches/1.7.x/STATUS

Author: pburba
Date: Fri Sep  2 17:34:23 2011
New Revision: 1164650

URL: http://svn.apache.org/viewvc?rev=1164650&view=rev
Log:
* STATUS: Nominate r1164645, fix for issue #3999 'svn merge with bad
  option or target segfaults'.

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=1164650&r1=1164649&r2=1164650&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Sep  2 17:34:23 2011
@@ -163,6 +163,14 @@ Candidate changes:
    Votes:
      +1: philip
 
+ * r1164645
+   Fix issue #3999 'svn merge with bad option or target segfaults'.
+   Justification:
+      Command line merge with too many targets and/or a bad option
+      (no leading '-') results in a segfault without this fix.
+   Votes:
+     +1: pburba
+
 Veto-blocked changes:
 =====================