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 2017/05/25 16:29:20 UTC
svn commit: r1796169 - /subversion/branches/1.9.x/STATUS
Author: stefan2
Date: Thu May 25 16:29:20 2017
New Revision: 1796169
URL: http://svn.apache.org/viewvc?rev=1796169&view=rev
Log:
* STATUS
Add r1796167 to the r1795116 (issue #4677)
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=1796169&r1=1796168&r2=1796169&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu May 25 16:29:20 2017
@@ -39,7 +39,7 @@ Candidate changes:
+1: jamessan
-0: stsp (see https://svn.haxx.se/dev/archive-2017-05/0047.shtml) (without r1795087)
- * r1795116
+ * r1795116, r1796167
Fix 'svn up' after a directories replaced a file (issue #4677).
Justification:
User-reported error that is difficult to work around because more
@@ -49,7 +49,7 @@ Candidate changes:
^/subversion/branches/1.9.x-r1795116
Votes:
+1: stefan2
- +0: stsp (text conflict in subversion/tests/libsvn_fs/fs-test.c)
+ +0: stsp (text conflict in subversion/tests/libsvn_fs/fs-test.c) (without r1796167)
* r1796143
Fix the FSFS breakage caused by the latest SHA-1-related merges.