You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/05 13:38:05 UTC
svn commit: r1154171 - /subversion/branches/1.7.x/STATUS
Author: rhuijben
Date: Fri Aug 5 11:38:04 2011
New Revision: 1154171
URL: http://svn.apache.org/viewvc?rev=1154171&view=rev
Log:
* STATUS: Cast vote and move 1.7.x-r1152189 to approved after checking the branch
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=1154171&r1=1154170&r2=1154171&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug 5 11:38:04 2011
@@ -82,17 +82,16 @@ Candidate changes:
+1: pburba, rhuijben
-0: the serf 2.x API will be incompatible with 1.7.x, so this will
never be useful
-
- * r1152189, r1152190
- Fix an assertion on copying nodes that are not presence normal.
- Branch:
- 1.7.x-r1152189
+
+ * r1154165
+ Make the cmdline argument parser ignore upgrade required errors to
+ allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an
+ error.
Justification:
- Easy to trigger problem in tree conflict situations.
+ Usually svn allows case differences, but in this case it doesn't.
+ (Triggerable in other scenarios)
Votes:
+1: rhuijben
- +1: philip, gstein (the branch solves a merge conflict that arises
- when applying r1152190)
Veto-blocked changes:
=====================
@@ -153,3 +152,13 @@ Approved changes:
r1153141 removes an accidentally added SVN_DBG() from r1153138.
Votes:
+1: rhuijben, gstein, philip
+
+* r1152189, r1152190
+ Fix an assertion on copying nodes that are not presence normal.
+ Branch:
+ 1.7.x-r1152189
+ Justification:
+ Easy to trigger problem in tree conflict situations.
+ Votes:
+ +1: rhuijben, philip, gstein
+
\ No newline at end of file