subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1509592 - /subversion/branches/1.8.x/STATUS
Date Fri, 02 Aug 2013 09:49:32 GMT
Author: danielsh
Date: Fri Aug  2 09:49:32 2013
New Revision: 1509592

URL: http://svn.apache.org/r1509592
Log:
* STATUS (1.8.x-issue4390): Add a 'Depends:' header to make the conflicts
    bot useful again.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1509592&r1=1509591&r2=1509592&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Aug  2 09:49:32 2013
@@ -60,10 +60,13 @@ Candidate changes:
      Regression from 1.6. User complained. See issue for details.
    Branch:
      ^/subversion/branches/1.8.x-issue4390
+   Depends:
+     Nomination conflicts with the branch and merges cleanly without it.
+     Branch should probably be removed from the nomination (it was only needed
+     before r1503552).
    Votes:
      +1: stsp, rhuijben
      -0: ivan (not regression from 1.7.x, destructive change in libsvn_wc core)
-     danielsh: merges cleanly without the branch, conflicts with it
 
  * r1501656, r1501702
    Fix the ability to build Debug Build with BDB FS on Windows.



Mime
View raw message