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

Posted to commits@subversion.apache.org by jc...@apache.org on 2018/07/12 02:07:44 UTC

svn commit: r1835694 - /subversion/branches/1.10.x/STATUS

Author: jcorvel
Date: Thu Jul 12 02:07:44 2018
New Revision: 1835694

URL: http://svn.apache.org/viewvc?rev=1835694&view=rev
Log:
* STATUS: Vote for conflict resolver fixes: r1830083 (issue #4739) and
   r1833895 (issue #4744) groups.

Modified:
    subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1835694&r1=1835693&r2=1835694&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jul 12 02:07:44 2018
@@ -34,7 +34,7 @@ Candidate changes:
      r1833866 is a small follow-up fix
      Issue #4744 fix should be merged after this to avoid merge conflicts.
    Votes:
-     +1: stsp
+     +1: stsp, jcorvel
 
  * r1833895, r1833897, r1833899, r1833901
    Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"
@@ -47,7 +47,7 @@ Candidate changes:
      r1833901 prevents the assertion failure and adjusts the test
      Issue #4739 fix should be merged before this to avoid merge conflicts.
   Votes:
-    +1: stsp
+    +1: stsp, jcorvel
 
  * r1833465
    Enforce the v1 HTTP protocol when a client sends PUT before CHECKOUT.