Author: julianfoad Date: Mon Sep 24 16:26:54 2018 New Revision: 1841873 URL: http://svn.apache.org/viewvc?rev=1841873&view=rev Log: * STATUS: Approve r1841719 group (support local missing dir conflicts).
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=1841873&r1=1841872&r2=1841873&view=diff ============================================================================== --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Mon Sep 24 16:26:54 2018 @@ -24,16 +24,16 @@ Candidate changes: +1: stsp, jcorvel (without r1841850) +1: rhuijben, julianfoad +Veto-blocked changes: +===================== + +Approved changes: +================= + * r1841719, r1841742 Add support for 'local missing' conflicts with directories. Justification: This case already works with files. Now also works with directories. Notes: merge needs --accept=12 Votes: - +1: stsp, jcorvel - -Veto-blocked changes: -===================== - -Approved changes: -================= + +1: stsp, jcorvel, julianfoad