Author: pburba
Date: Thu Oct 25 00:57:08 2012
New Revision: 1401938
URL: http://svn.apache.org/viewvc?rev=1401938&view=rev
Log:
* STATUS: Nominate r1401915.
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=1401938&r1=1401937&r2=1401938&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Oct 25 00:57:08 2012
@@ -70,6 +70,16 @@ Candidate changes:
Votes:
+1: stsp
+ * r1401915
+ Ignore file externals with mergeinfo when merging.
+ Justification:
+ Prevents a segfault,
+ see http://svn.haxx.se/dev/archive-2012-10/0364.shtml
+ Branch:
+ ^/subversion/branches/1.7.x-r1401915
+ Votes:
+ +1: pburba
+
Veto-blocked changes:
=====================
