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/02/15 14:08:47 UTC

svn commit: r1244472 - /subversion/branches/1.7.x/STATUS

Author: stsp
Date: Wed Feb 15 13:08:47 2012
New Revision: 1244472

URL: http://svn.apache.org/viewvc?rev=1244472&view=rev
Log:
* STATUS: Nominate r1243920 and r1244466.

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=1244472&r1=1244471&r2=1244472&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Feb 15 13:08:47 2012
@@ -60,7 +60,7 @@ Candidate changes:
    Votes:
      +1: rhuijben, philip
 
- * r1200277, r1243694, r1243840
+ * r1200277, r1243694, r1243840, r1243920, r1244466
    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
@@ -72,6 +72,8 @@ Candidate changes:
      r1200277 was 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
    Votes:
      +1: stsp