Date: Thu, 22 Mar 2018 10:58:23 -0600 From: Adam Weinberger <adamw@adamw.org> To: yuri@freebsd.org Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r465275 - in head/databases/sqlite3: . files Message-ID: <9C43B0F9-A8A6-4EA7-BAFC-5B943A1DBD5B@adamw.org> In-Reply-To: <e6bc31a7-d3c7-5b27-e27c-79e4422b70bc@freebsd.org> References: <201803220852.w2M8qwBX047215@repo.freebsd.org> <1F60050C-2237-4791-8CD0-4C03C793F219@adamw.org> <e6bc31a7-d3c7-5b27-e27c-79e4422b70bc@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9C43B0F9-A8A6-4EA7-BAFC-5B943A1DBD5B>