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 2012/03/01 14:08:32 UTC
svn commit: r1295548 - /subversion/branches/1.7.x/STATUS
Author: stsp
Date: Thu Mar 1 13:08:32 2012
New Revision: 1295548
URL: http://svn.apache.org/viewvc?rev=1295548&view=rev
Log:
* STATUS: Add r1164929 to issue #4087 group.
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=1295548&r1=1295547&r2=1295548&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar 1 13:08:32 2012
@@ -15,7 +15,7 @@ Status of 1.7.4:
Candidate changes:
==================
- * r1200277, r1243694, r1243840, r1243920, r1244466, r1244551, r1295372
+ * 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
@@ -24,7 +24,7 @@ Candidate changes:
Branch:
^/subversion/branches/1.7.x-issue4087
Notes:
- r1200277 was merged to simplify conflict resolution
+ 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