svn commit: r923697 - /subversion/branches/1.6.x/STATUS

[rh...@apache.org]

Author: rhuijben
Date: Tue Mar 16 11:32:20 2010
New Revision: 923697

URL: http://svn.apache.org/viewvc?rev=923697&view=rev
Log:
* STATUS: Cast a few more votes, approving issue #3242 and #3573 fixes

Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=923697&r1=923696&r2=923697&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 11:32:20 2010
@@ -112,20 +112,6 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
- * r906256, r906305
-   Fix issue #3573 'local non-inheritable mergeinfo changes not properly
-   merged with updated mergeinfo'
-   Notes:
-   Justification:
-     svn:mergeinfo should be mergeable, but in this issue mergeinfo changes
-     brought down by an update were not properly merged with local changes.
-   Notes:
-     r906256 is a test demonstrating the problem and r906305 is the fix.
-   Branch:
-     ^/subversion/branches/1.6.x-issue3573
-   Votes:
-     +1: pburba, cmpilato
-
  * r877016, r902093
    Fix issue #3390 'relative externals not updated during switch'.
    Justification:
@@ -138,20 +124,6 @@ Candidate changes:
    Votes:
      +1: cmpilato, stsp
 
- * ^/subversion/branches/1.6.x-issue-3242-partial
-   Merge a portion of the issue 3242 work, specifically the bit that
-   makes mergeinfo queries in the client layer happen against the
-   current RA session URL instead of forcibly against the repository
-   root URL (which might not be readable by the user per authz
-   policy).  While this is not a full solution to issue #3242, it
-   should get us back to Subversion 1.4-level behavior which has
-   pretty consistently been deemed acceptable (enough) by our user
-   base.
-   Justification:
-     Issue #3242 is a hot issue.  Hot topic, hot tempers, etc.
-   Votes:
-     +1: cmpilato, ivan
-
  * r878590, r878607, r878625, r878626, r878627
    In trunk we optimized the common case of 'find-and-replace with same uri'
    of proxied content thanks to issue 3445.
@@ -295,6 +267,20 @@ Approved changes:
    Votes:
      +1: stsp, cmpilato, rhuijben
 
+ * r906256, r906305
+   Fix issue #3573 'local non-inheritable mergeinfo changes not properly
+   merged with updated mergeinfo'
+   Notes:
+   Justification:
+     svn:mergeinfo should be mergeable, but in this issue mergeinfo changes
+     brought down by an update were not properly merged with local changes.
+   Notes:
+     r906256 is a test demonstrating the problem and r906305 is the fix.
+   Branch:
+     ^/subversion/branches/1.6.x-issue3573
+   Votes:
+     +1: pburba, cmpilato, rhuijben
+
  * r917640, r918211
    Correctly handle invocations of 'svnlook plist --revprop' when
    used with '-t TXN_NAME' instead of '-r REV'.
@@ -313,3 +299,17 @@ Approved changes:
      it does not make a difference for users.
    Votes:
      +1: stsp, cmpilato, rhuijben
+
+ * ^/subversion/branches/1.6.x-issue-3242-partial
+   Merge a portion of the issue 3242 work, specifically the bit that
+   makes mergeinfo queries in the client layer happen against the
+   current RA session URL instead of forcibly against the repository
+   root URL (which might not be readable by the user per authz
+   policy).  While this is not a full solution to issue #3242, it
+   should get us back to Subversion 1.4-level behavior which has
+   pretty consistently been deemed acceptable (enough) by our user
+   base.
+   Justification:
+     Issue #3242 is a hot issue.  Hot topic, hot tempers, etc.
+   Votes:
+     +1: cmpilato, ivan, rhuijben