You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/12/10 19:11:24 UTC
svn commit: r1644499 - /subversion/branches/1.8.x/STATUS
Author: julianfoad
Date: Wed Dec 10 18:11:23 2014
New Revision: 1644499
URL: http://svn.apache.org/r1644499
Log:
* STATUS: Change my veto on r1643074 to +1 having fixed the swig-rb issue.
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=1644499&r1=1644498&r2=1644499&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Dec 10 18:11:23 2014
@@ -86,19 +86,6 @@ Candidate changes:
+0: rhuijben (previously said +1 with the wrong branch mentioned)
+0: stefan2 (previously said +1 with the wrong branch mentioned)
-Veto-blocked changes:
-=====================
-
- * r1524145
- Make the 'm' conflict prompt option run external merge tool if configured.
- Justification:
- Usability fix. The current behaviour ('m' -> internal merge tool,
- 'l' -> external merge tool) confuses users who try 'm' to run an
- external merge tool. See issue #4426.
- Votes:
- +1: stsp
- -1: breser (see my email to dev@, <52...@reser.org>)
-
* r1643074
Don't let invalid mergeinfo stop 'svnadmin load' from working.
Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
@@ -113,7 +100,20 @@ Veto-blocked changes:
Branch:
^/subversion/branches/1.8.x-r1643074
Votes:
- -1: julianfoad (breaks swig-rb; working on a fix...)
+ +1: julianfoad
+
+Veto-blocked changes:
+=====================
+
+ * r1524145
+ Make the 'm' conflict prompt option run external merge tool if configured.
+ Justification:
+ Usability fix. The current behaviour ('m' -> internal merge tool,
+ 'l' -> external merge tool) confuses users who try 'm' to run an
+ external merge tool. See issue #4426.
+ Votes:
+ +1: stsp
+ -1: breser (see my email to dev@, <52...@reser.org>)
Approved changes:
=================