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

Posted to commits@subversion.apache.org by st...@apache.org on 2015/07/03 14:45:46 UTC

svn commit: r1689009 - /subversion/branches/1.9.x/STATUS

Author: stsp
Date: Fri Jul  3 12:45:46 2015
New Revision: 1689009

URL: http://svn.apache.org/r1689009
Log:
* STATUS: Add r1688258 for issue #4285 fix.

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=1689009&r1=1689008&r2=1689009&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Jul  3 12:45:46 2015
@@ -32,14 +32,15 @@ Other candidate changes:
      +1: rhuijben, ivan
      +0.9: brane (The change looks trivially correct, but I can't test it)
 
- * r1686175, r1687029
+ * r1686175, r1687029, r1688258
    Fix issue #4285, "reintegrate complains about missing ranges from node
    unrelated to branch"
    Justification:
      Reintegrate merge is impossible after the default conflict resolution
      option is applied to a particular tree conflict during a sync merge.
    Votes:
-     +1: stsp, brane
+     +1: stsp
+     +1: brane (without r1688258)
 
 Veto-blocked changes:
 =====================