subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1186328 - /subversion/branches/1.7.x/STATUS
Date Wed, 19 Oct 2011 16:54:28 GMT
Author: philip
Date: Wed Oct 19 16:54:28 2011
New Revision: 1186328

URL: http://svn.apache.org/viewvc?rev=1186328&view=rev
Log:
* STATUS: Add branch and vote

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=1186328&r1=1186327&r2=1186328&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Oct 19 16:54:28 2011
@@ -58,10 +58,12 @@ Candidate changes:
    Notes:
      r1185738, r1185763, r1185768: adds a test for this problem.
      r1185886: fixes this issue and cleans up whitespace in the test.
-     Merge conflicts with issue r1177732 group.
+     Merge conflicts with issue r1177732 group.  Branch includes both sets.
+   Branch:
+     1.7.x-issue4035-r1185738
    Votes:
      +1: rhuijben (not r1186240)
-     +0: philip (needs r1186240 but there are merge conflicts)
+     +1: philip
 
  * r1186231
    FSFS: Fix validation so it doesn't hork preexisting repositories that



Mime
View raw message