svn commit: r465275 - in head/databases/sqlite3: . files

[Adam Weinberger]

> On 22 Mar, 2018, at 10:57, Yuri <yuri at 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 at adamw.org
http://www.adamw.org