You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2019/12/04 03:00:45 UTC
svn commit: r1870780 - /subversion/branches/1.11.x/STATUS
Author: jamessan
Date: Wed Dec 4 03:00:44 2019
New Revision: 1870780
URL: http://svn.apache.org/viewvc?rev=1870780&view=rev
Log:
* STATUS:
Vote +1 on r1851903, approving.
Vote +1 on r1853450, approving.
Vote +1 on r1856397.
Modified:
subversion/branches/1.11.x/STATUS
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870780&r1=1870779&r2=1870780&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Dec 4 03:00:44 2019
@@ -14,13 +14,6 @@ Status of 1.11.2:
Candidate changes:
==================
- * r1851903
- Fix missing unlock of working copy in a resolver error case.
- Justification:
- Could force users to run 'svn cleanup' unnecessarily.
- Votes:
- +1: stsp, rhuijben
-
* r1851920
Remove a useless common ancestor search from the conflict resolver.
Justification:
@@ -40,13 +33,6 @@ Candidate changes:
+1: stsp
-0: rhuijben (I would recommend setting a proper svn:ignore instead)
- * r1853450
- Enable 'incoming_move_file_merge' option only if local change is file edit.
- Justification:
- Conflict resolver misbehaves when it runs into move vs move conflicts.
- Votes:
- +1: stsp, rhuijben
-
* r1855419
Fix conflict resolver bug where local and incoming edits got swapped.
Justification:
@@ -62,10 +48,25 @@ Candidate changes:
Justification:
Makes it easier to build Subversion on Windows. Simple local fix.
Votes:
- +1: rhuijben
+ +1: rhuijben, jamessan
Veto-blocked changes:
=====================
Approved changes:
=================
+
+ * r1851903
+ Fix missing unlock of working copy in a resolver error case.
+ Justification:
+ Could force users to run 'svn cleanup' unnecessarily.
+ Votes:
+ +1: stsp, rhuijben, jamessan
+
+ * r1853450
+ Enable 'incoming_move_file_merge' option only if local change is file edit.
+ Justification:
+ Conflict resolver misbehaves when it runs into move vs move conflicts.
+ Votes:
+ +1: stsp, rhuijben, jamessan
+