From commits-return-50372-archive-asf-public=cust-asf.ponee.io@subversion.apache.org  Wed Feb 13 10:40:15 2019
Return-Path: <commits-return-50372-archive-asf-public=cust-asf.ponee.io@subversion.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 3234F180674
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 13 Feb 2019 11:40:15 +0100 (CET)
Received: (qmail 92236 invoked by uid 500); 13 Feb 2019 10:40:14 -0000
Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@subversion.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@subversion.apache.org>
List-Post: <mailto:commits@subversion.apache.org>
List-Id: <commits.subversion.apache.org>
Reply-To: dev@subversion.apache.org
Delivered-To: mailing list commits@subversion.apache.org
Received: (qmail 92226 invoked by uid 99); 13 Feb 2019 10:40:14 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2019 10:40:14 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6E84C3A005B
	for <commits@subversion.apache.org>; Wed, 13 Feb 2019 10:40:13 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1853484 - /subversion/branches/1.11.x/STATUS
Date: Wed, 13 Feb 2019 10:40:12 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20190213104013.6E84C3A005B@svn01-us-west.apache.org>

Author: stsp
Date: Wed Feb 13 10:40:12 2019
New Revision: 1853484

URL: http://svn.apache.org/viewvc?rev=1853484&view=rev
Log:
* STATUS: Nominate r1853450.

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=1853484&r1=1853483&r2=1853484&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Feb 13 10:40:12 2019
@@ -94,6 +94,13 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * 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
+
 Veto-blocked changes:
 =====================