subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1230233 - /subversion/branches/1.7.x/STATUS
Date Wed, 11 Jan 2012 20:27:42 GMT
Author: philip
Date: Wed Jan 11 20:27:42 2012
New Revision: 1230233

URL: http://svn.apache.org/viewvc?rev=1230233&view=rev
Log:
* STATUS: Propose r1221767 to avoid conflict

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=1230233&r1=1230232&r2=1230233&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jan 11 20:27:42 2012
@@ -112,12 +112,15 @@ Candidate changes:
    Votes:
      -0: rhuijben (Behavior change without positive votes? 1.8?)
 
- * r1221780
+ * r1221767, r1221780
    Fix SVNParentPath listings for parent paths which contain symlinks.
    This was supposed to have been fixed by r1132782, but that solution
    had problems of its own.
+   Notes:
+     r1221767 is code formatting only, needed to avoid a conflict
    Votes:
-     +1: cmpilato, rhuijben
+     +1: cmpilato, rhuijben (r1221780 only)
+     +1: philip
 
  * r1222628, r1222644, r1222699
    Improve another error message coming from SASL.



Mime
View raw message