You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/04/25 19:30:15 UTC

svn commit: r1590086 - /subversion/branches/1.8.x/STATUS

Author: breser
Date: Fri Apr 25 17:30:15 2014
New Revision: 1590086

URL: http://svn.apache.org/r1590086
Log:
* STATUS: Vote for and approve r1580626 group, remove branch from 1584576 group,
    since the conflict causing the need for the branch is no longer relevant
    since 1.8.x-r1584342 has been merged.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1590086&r1=1590085&r2=1590086&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 25 17:30:15 2014
@@ -179,17 +179,6 @@ Candidate changes:
    Votes:
      +1: rhuijben, breser
 
- * r1580626, r1580650, r1581430
-   Fix 'svn copy URL WC' after the working copy is relocated
-   Justification:
-     Without this patch (which is a followup of 1560690 backported in 1.8.8),
-     descendants of copies in a relocated working copy are marked as incomplete
-     (and these nodes are all created at their own op-depth)
-   Branch:
-     ^/subversion/branches/1.8.x-r1580626
-   Votes:
-     +1: rhuijben, philip
-
  * r1577739, r1577755, r1588772, r1588778
    Resolve issue #4480: Mergeinfo overwritten on successive merges
    Justification:
@@ -287,8 +276,16 @@ Approved changes:
      Patch needed, because a plain merge triggers a text conflict while
      removing the XFail marker from the test. r1584745 makes the test code
      compatible with 1.8.
+   Votes:
+     +1: rhuijben, philip, breser
+
+ * r1580626, r1580650, r1581430
+   Fix 'svn copy URL WC' after the working copy is relocated
+   Justification:
+     Without this patch (which is a followup of 1560690 backported in 1.8.8),
+     descendants of copies in a relocated working copy are marked as incomplete
+     (and these nodes are all created at their own op-depth)
    Branch:
-     ^/subversion/branches/1.8.x-r1584592
-     (merge from trunk if ^/subversion/branches/1.8.x-r1584342 is merged first)
+     ^/subversion/branches/1.8.x-r1580626
    Votes:
      +1: rhuijben, philip, breser