From owner-svn-ports-head@freebsd.org  Thu Mar 22 16:58:28 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 6E12FF568A5;
 Thu, 22 Mar 2018 16:58:28 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: from apnoea.adamw.org (apnoea.adamw.org [104.225.5.94])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "apnoea.adamw.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 27BAF7F49B;
 Thu, 22 Mar 2018 16:58:26 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: by apnoea.adamw.org (OpenSMTPD) with ESMTPSA id 138e8a5d
 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO;
 Thu, 22 Mar 2018 10:58:24 -0600 (MDT)
Content-Type: text/plain;
	charset=us-ascii;
	delsp=yes;
	format=flowed
Mime-Version: 1.0 (Mac OS X Mail 11.2 \(3445.5.20\))
Subject: Re: svn commit: r465275 - in head/databases/sqlite3: . files
From: Adam Weinberger <adamw@adamw.org>
In-Reply-To: <e6bc31a7-d3c7-5b27-e27c-79e4422b70bc@freebsd.org>
Date: Thu, 22 Mar 2018 10:58:23 -0600
Cc: svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Content-Transfer-Encoding: 7bit
Message-Id: <9C43B0F9-A8A6-4EA7-BAFC-5B943A1DBD5B@adamw.org>
References: <201803220852.w2M8qwBX047215@repo.freebsd.org>
 <1F60050C-2237-4791-8CD0-4C03C793F219@adamw.org>
 <e6bc31a7-d3c7-5b27-e27c-79e4422b70bc@freebsd.org>
To: yuri@freebsd.org
X-Mailer: Apple Mail (2.3445.5.20)
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Mar 2018 16:58:28 -0000

> On 22 Mar, 2018, at 10:57, Yuri <yuri@freebsd.org> wrote:
>
> 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?

I think what you're running into is some missing commits. When you MFH, you  
have to also MFH all the commits leading up to that one since the branch  
point.

# Adam


--
Adam Weinberger
adamw@adamw.org
http://www.adamw.org