Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1151411 - /subversion/branches/1.7.x/STATUS
Date: Wed, 27 Jul 2011 10:03:16 -0000
To: commits@subversion.apache.org
From: philip@apache.org
Message-Id: <20110727100317.0D2AB2388901@eris.apache.org>

Author: philip
Date: Wed Jul 27 10:03:16 2011
New Revision: 1151411

URL: http://svn.apache.org/viewvc?rev=1151411&view=rev
Log:
* STATUS: Vote/approve r1150372.

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=1151411&r1=1151410&r2=1151411&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jul 27 10:03:16 2011
@@ -144,14 +144,6 @@ Candidate changes:
      +0: danielsh (we shouldn't depend on libsvn_client fixes to avoid
                    accumulating tempfiles on the server)
 
- * r1150372
-   When resolving to conflict-*, close the generated file before using it
-   Justification:
-     Copying unclosed/unflushed files is not nice and might cause all kinds
-     of problems.
-   Votes:
-     +1: rhuijben, danielsh
-
  * r1150441
    Closing a translated stream should close the inner stream.
    Justification:
@@ -205,3 +197,11 @@ Approved changes:
      this revision depends for a clean merge).
    Votes:
      +1: rhuijben, danielsh, cmpilato
+
+ * r1150372
+   When resolving to conflict-*, close the generated file before using it
+   Justification:
+     Copying unclosed/unflushed files is not nice and might cause all kinds
+     of problems.
+   Votes:
+     +1: rhuijben, danielsh, philip