You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/10/26 14:49:29 UTC
svn commit: r1710598 - /subversion/branches/1.9.x/STATUS
Author: ivan
Date: Mon Oct 26 13:49:29 2015
New Revision: 1710598
URL: http://svn.apache.org/viewvc?rev=1710598&view=rev
Log:
* STATUS: Vote for r1701598 group. Approving.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1710598&r1=1710597&r2=1710598&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Mon Oct 26 13:49:29 2015
@@ -30,19 +30,6 @@ Candidate changes:
+0: julianfoad, rhuijben (he says it works, but I haven't reviewed or tested)
+0: danielsh (not tested; would be nice to have a $ anchor in the pattern)
- * r1701598, r1701603, r1701611, r1701646
- Make 'svn lock' and 'svn unlock' report (un)lock errors as failure
- Justification:
- A single lock or unlock failure doesn't affect the whole operation
- since 1.9, but this has the side effect of no longer producing an
- error at all on failures. This patch makes 'svn' return an error when
- at least one failure is reported by the locking code.
- Notes:
- r1701598 is the actual fix. The other patches simplify and fix
- test expectations.
- Votes:
- +1: rhuijben, philip
-
* r1703581
Allow simple resolving of binary file text conflicts
Justification:
@@ -154,3 +141,16 @@ Approved changes:
r1706324 fixes the crash.
Votes:
+1: kotkov, philip, ivan
+
+ * r1701598, r1701603, r1701611, r1701646
+ Make 'svn lock' and 'svn unlock' report (un)lock errors as failure
+ Justification:
+ A single lock or unlock failure doesn't affect the whole operation
+ since 1.9, but this has the side effect of no longer producing an
+ error at all on failures. This patch makes 'svn' return an error when
+ at least one failure is reported by the locking code.
+ Notes:
+ r1701598 is the actual fix. The other patches simplify and fix
+ test expectations.
+ Votes:
+ +1: rhuijben, philip, ivan