svn commit: r1336049 - /subversion/branches/1.7.x/STATUS

[st...@apache.org]

Author: stsp
Date: Wed May  9 09:58:09 2012
New Revision: 1336049

URL: http://svn.apache.org/viewvc?rev=1336049&view=rev
Log:
* STATUS: Change my -0 vote for the #4169 fix to a +1. The problem I noted was
   a pilot error: I was merging into a trunk working copy instead of 1.7.x.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1336049&r1=1336048&r2=1336049&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May  9 09:58:09 2012
@@ -70,20 +70,6 @@ Candidate changes:
    Votes:
      +1: philip, danielsh
 
- * r1330444, 1330520
-   Fix issue #4169 'added subtrees with non-inheritable mergeinfo cause
-   spurious subtree mergeinfo'.
-   Justification:
-     Prevents spurious subtree mergeinfo in an edge case.
-   Branch:
-     ^/subversion/branches/1.7.x-issue4169
-   Votes:
-     +1: pburba, rhuijben
-     -0: stsp (--reintegrate merge of this branch fails for me, probably
-               due to a new and unrelated bug in trunk:
-               svn: E160013: '/repos/asf/!svn/rvr/1330520/subversion/trunk/subversion/libsvn_subr/svn_base64.c' path not found)
-
-
  * r1335104
    Avoid a sometimes very expensive operation in svn status' external
    processing. (issue #4178)
@@ -128,3 +114,13 @@ Approved changes:
      ^/subversion/branches/1.7.x-issue4166
    Votes:
      +1: pburba, philip, stsp
+
+ * r1330444, 1330520
+   Fix issue #4169 'added subtrees with non-inheritable mergeinfo cause
+   spurious subtree mergeinfo'.
+   Justification:
+     Prevents spurious subtree mergeinfo in an edge case.
+   Branch:
+     ^/subversion/branches/1.7.x-issue4169
+   Votes:
+     +1: pburba, rhuijben, stsp