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 2010/09/29 17:46:55 UTC
svn commit: r1002693 - /subversion/branches/1.6.x/STATUS

Author: stsp
Date: Wed Sep 29 15:46:54 2010
New Revision: 1002693

URL: http://svn.apache.org/viewvc?rev=1002693&view=rev
Log:
* STATUS: Vote for r948512 group, approving.

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=1002693&r1=1002692&r2=1002693&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Sep 29 15:46:54 2010
@@ -96,22 +96,6 @@ Candidate changes:
    Votes:
      +1: kameshj
 
- * r948512, r949307
-   Fix issue #3646 'record-only merges create self-referential mergeinfo'.
-   Justification:
-     Prevents creation of self-referential mergeinfo (i.e. mergeinfo that
-     is redundant with a path's natural history).  Self-referential mergeinfo
-     is a source of confusion at best and a source of bugs at worst (e.g.
-     http://subversion.tigris.org/issues/show_bug.cgi?id=3294#desc1 and
-     http://svn.apache.org/viewvc?view=revision&revision=873767).
-   Branch:
-     WCNG work on trunk necessitated a backport branch.
-     ^/subversion/branches/1.6.x-issue3646
-   Notes:
-     r948512 is a new test for the issue and r949307 is the fix.
-   Votes:
-     +1: pburba, cmpilato
-
  * r996884
    Hide unreadable directory children in mod_dav_svn's GET response.
    Justification:
@@ -295,3 +279,19 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r948512, r949307
+   Fix issue #3646 'record-only merges create self-referential mergeinfo'.
+   Justification:
+     Prevents creation of self-referential mergeinfo (i.e. mergeinfo that
+     is redundant with a path's natural history).  Self-referential mergeinfo
+     is a source of confusion at best and a source of bugs at worst (e.g.
+     http://subversion.tigris.org/issues/show_bug.cgi?id=3294#desc1 and
+     http://svn.apache.org/viewvc?view=revision&revision=873767).
+   Branch:
+     WCNG work on trunk necessitated a backport branch.
+     ^/subversion/branches/1.6.x-issue3646
+   Notes:
+     r948512 is a new test for the issue and r949307 is the fix.
+   Votes:
+     +1: pburba, cmpilato, stsp