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

[st...@apache.org]

Author: stsp
Date: Tue Nov  9 22:33:25 2010
New Revision: 1033271

URL: http://svn.apache.org/viewvc?rev=1033271&view=rev
Log:
* STATUS: Vote for r1028108, 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=1033271&r1=1033270&r2=1033271&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Nov  9 22:33:25 2010
@@ -152,17 +152,6 @@ Candidate changes:
    Votes:
      +1: cmpilato
 
- * r1028108
-   Fix issue #3270 ("'svn log -g' should more gracefully and
-   conservatively handle invalid mergeinfo source paths")
-   Justification:
-     Mergeinfo can contain bogus paths, either because Subversion
-     recorded it that way (issue issue #3271) or because it was
-     hand-edited that way.  But one bogus location in mergeinfo 
-     is not a good reason to ignore the other non-bogus ones.
-   Votes:
-     +1: cmpilato, hwright
-
  * r1031165, r1031186
    Fix issue #3666 ("Assertion frb->last_filename == NULL fails in 
    libsvn_client/blame.c").
@@ -276,3 +265,14 @@ Approved changes:
      Somewhat non-trivial merge conflicts.
    Votes:
      +1: danielsh, cmpilato, stsp
+
+ * r1028108
+   Fix issue #3270 ("'svn log -g' should more gracefully and
+   conservatively handle invalid mergeinfo source paths")
+   Justification:
+     Mergeinfo can contain bogus paths, either because Subversion
+     recorded it that way (issue issue #3271) or because it was
+     hand-edited that way.  But one bogus location in mergeinfo 
+     is not a good reason to ignore the other non-bogus ones.
+   Votes:
+     +1: cmpilato, hwright, stsp