You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2015/09/12 00:33:12 UTC

svn commit: r1702564 - /subversion/branches/1.9.x/STATUS

Author: rhuijben
Date: Fri Sep 11 22:33:12 2015
New Revision: 1702564

URL: http://svn.apache.org/r1702564
Log:
* STATUS: Extend nomination a bit more to avoid a merge conflict.

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1702564&r1=1702563&r2=1702564&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Sep 11 22:33:12 2015
@@ -137,12 +137,14 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
- * r1702467, r1702472, r1702549, r1702553
+ * r1678755, r1679240, r1702467, r1702472, r1702549, r1702553
    Unbreak propset followed by put on the same svnmucc target
    Justification:
      Assuming that the target exists, this should just work without
      an error... It produced an error.
    Notes:
+     r1678755, r1679240 - Adds some regression tests that would cause
+                          conflicts
      r1702467 - fixes the real bug.
      r1702472 - fixes a few error message texts
      r1702549, r1702553 - adds regression tests