From owner-svn-ports-all@freebsd.org  Thu Mar 22 16:57:06 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 731BAF566AE;
 Thu, 22 Mar 2018 16:57:06 +0000 (UTC)
 (envelope-from yuri@freebsd.org)
Received: from shell1.rawbw.com (shell1.rawbw.com [198.144.192.42])
 by mx1.freebsd.org (Postfix) with ESMTP id 014AA7F3A0;
 Thu, 22 Mar 2018 16:57:05 +0000 (UTC)
 (envelope-from yuri@freebsd.org)
Received: from yv.noip.me (c-24-4-131-132.hsd1.ca.comcast.net [24.4.131.132])
 (authenticated bits=0)
 by shell1.rawbw.com (8.15.1/8.15.1) with ESMTPSA id w2MGv2Jf046096
 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO);
 Thu, 22 Mar 2018 09:57:03 -0700 (PDT)
 (envelope-from yuri@freebsd.org)
X-Authentication-Warning: shell1.rawbw.com: Host
 c-24-4-131-132.hsd1.ca.comcast.net [24.4.131.132] claimed to be yv.noip.me
Reply-To: yuri@freebsd.org
Subject: Re: svn commit: r465275 - in head/databases/sqlite3: . files
To: Adam Weinberger <adamw@adamw.org>
Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
References: <201803220852.w2M8qwBX047215@repo.freebsd.org>
 <1F60050C-2237-4791-8CD0-4C03C793F219@adamw.org>
From: Yuri <yuri@freebsd.org>
Message-ID: <e6bc31a7-d3c7-5b27-e27c-79e4422b70bc@freebsd.org>
Date: Thu, 22 Mar 2018 09:57:01 -0700
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <1F60050C-2237-4791-8CD0-4C03C793F219@adamw.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Mar 2018 16:57:06 -0000

On 03/22/18 07:30, Adam Weinberger wrote:
>
> Also this needs an MFH, no?


Hi Adam,


I obtained the authorization. But my commit asks to confirm some merge:

$ /usr/ports/Tools/scripts/mfh 465275

...

  U   2018Q1/databases/sqlite3
Summary of conflicts:
   Tree conflicts: 1
Tree conflict on '2018Q1/databases/sqlite3/files'
    > local dir obstruction, incoming dir add upon merge
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:


Is this normal and just needs to be confirmed?

Is this because the previous commit to SQLite needs to be MFCed 
separately? (Shouldn't it do this automatically?)

Is this a bug?


Perhaps you know what should be done here?


Thank you,

Yuri