subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1764421 - /subversion/branches/1.9.x/STATUS
Date Wed, 12 Oct 2016 09:43:16 GMT
Author: stefan2
Date: Wed Oct 12 09:43:16 2016
New Revision: 1764421

URL: http://svn.apache.org/viewvc?rev=1764421&view=rev
Log:
* STATUS:
   Remove -0 vote from r1721285 after talking to stsp

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=1764421&r1=1764420&r2=1764421&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Oct 12 09:43:16 2016
@@ -63,10 +63,6 @@ Candidate changes:
      uncached directories.
    Votes:
      +1: stefan2, steveking
-     -0: stsp (merge conflict; needs a backport branch)
-              (rhuijben: Are you sure? svn merge doesn't produce a conflict
-               for me)
-              (stsp: Merge conflict appears only with svn-trunk, not 1.9.x)
 
  * r1724448
    Fix handling of newly secured subdirectories in a working copy



Mime
View raw message