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

Posted to commits@subversion.apache.org by ph...@apache.org on 2015/07/03 17:41:27 UTC

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

Author: philip
Date: Fri Jul  3 15:41:26 2015
New Revision: 1689039

URL: http://svn.apache.org/r1689039
Log:
* STATUS: vote for issue 4582 partial 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=1689039&r1=1689038&r2=1689039&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Jul  3 15:41:26 2015
@@ -33,13 +33,13 @@ Other candidate changes:
      +0.9: brane (The change looks trivially correct, but I can't test it)
 
  * r1686175, r1687029, r1688258
-   Fix issue #4285, "reintegrate complains about missing ranges from node
-   unrelated to branch"
+   Fix part of issue #4582, "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
+     +1: stsp, philip
      +1: brane (without r1688258)
 
 Veto-blocked changes: