Author: hartmannathan
Date: Fri Dec 18 06:36:28 2020
New Revision: 1884598
URL: http://svn.apache.org/viewvc?rev=1884598&view=rev
Log:
* STATUS: Move r1880192 and the r1881985 group to Approved
Modified:
subversion/branches/1.14.x/STATUS
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1884598&r1=1884597&r2=1884598&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Dec 18 06:36:28 2020
@@ -15,24 +15,6 @@ Status of 1.14.1:
Candidate changes:
==================
- * r1880192
- Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic".
- Justification:
- Non-deterministic merge result is bad.
- Depends:
- r1878997, r1879192, r1879474, r1879959 (Fix issue #4859)
- Votes:
- +1: julianfoad, hartmannathan, jcorvel
-
- * r1881985, r1882105
- Follow up to r1880192: Fix an EOL issue in test on Windows.
- Justification:
- We should test correctly on Windows environment, too.
- Depends:
- r1880192
- Votes:
- +1: futatuki, jcorvel, hartmannathan
-
* r1877310
Add a test for issue #4711 "invalid xml file produced by svn log --xml
--verbose --use-merge-history --search".
@@ -70,3 +52,21 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1880192
+ Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic".
+ Justification:
+ Non-deterministic merge result is bad.
+ Depends:
+ r1878997, r1879192, r1879474, r1879959 (Fix issue #4859)
+ Votes:
+ +1: julianfoad, hartmannathan, jcorvel
+
+ * r1881985, r1882105
+ Follow up to r1880192: Fix an EOL issue in test on Windows.
+ Justification:
+ We should test correctly on Windows environment, too.
+ Depends:
+ r1880192
+ Votes:
+ +1: futatuki, jcorvel, hartmannathan