subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1336059 - /subversion/branches/1.7.x/STATUS
Date Wed, 09 May 2012 10:37:04 GMT
Author: rhuijben
Date: Wed May  9 10:37:03 2012
New Revision: 1336059

URL: http://svn.apache.org/viewvc?rev=1336059&view=rev
Log:
* STATUS: Cast a '+0.9'.

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=1336059&r1=1336058&r2=1336059&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May  9 10:37:03 2012
@@ -15,25 +15,6 @@ Status of 1.7.5:
 Candidate changes:
 ==================
 
- * r1164929, r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372
-   Workaround for issue #4087, "bogus repos_id in wc.db for file externals"
-   Justification:
-     Regression from 1.6. Some repositories with file externals cannot be
-     checked out with 1.7. Users complained.
-     See http://svn.haxx.se/users/archive-2011-12/0299.shtml
-   Branch:
-     ^/subversion/branches/1.7.x-issue4087
-   Notes:
-     r1164929 and r1200277 were merged to simplify conflict resolution
-     r1243694 implements the workaround
-     r1243840 is a cosmetic follow-up treak
-     r1243920 was merged for conflict resolution for r1244466
-     r1244466 eliminates an unneccesary RA round-trip from r1243694
-     r1244551 uses a better API to query the local repos root and uuid
-     r1295372 improves test coverage
-   Votes:
-     +1: stsp, neels
-
  * r1293945, r1293972, r1293976, r1293998, r1294136, r1294236;
    r1294134, r1294147, r1294586
    Two interdependent changes:
@@ -124,3 +105,23 @@ Approved changes:
      ^/subversion/branches/1.7.x-issue4169
    Votes:
      +1: pburba, rhuijben, stsp
+
+ * r1164929, r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372
+   Workaround for issue #4087, "bogus repos_id in wc.db for file externals"
+   Justification:
+     Regression from 1.6. Some repositories with file externals cannot be
+     checked out with 1.7. Users complained.
+     See http://svn.haxx.se/users/archive-2011-12/0299.shtml
+   Branch:
+     ^/subversion/branches/1.7.x-issue4087
+   Notes:
+     r1164929 and r1200277 were merged to simplify conflict resolution
+     r1243694 implements the workaround
+     r1243840 is a cosmetic follow-up treak
+     r1243920 was merged for conflict resolution for r1244466
+     r1244466 eliminates an unneccesary RA round-trip from r1243694
+     r1244551 uses a better API to query the local repos root and uuid
+     r1295372 improves test coverage
+   Votes:
+     +1: stsp, neels
+     +1: rhuijben (Fix is good, but a very noisy merge)



Mime
View raw message