Date: Mon, 29 Jun 2020 14:09:27 -0400 From: Ed Maste <emaste@freebsd.org> To: John Baldwin <jhb@freebsd.org> Cc: =?UTF-8?B?U3RlZmFuIEXDn2Vy?= <se@freebsd.org>, Eric van Gyzen <eric@vangyzen.net>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r362681 - in head: contrib/bc contrib/bc/gen contrib/bc/include contrib/bc/locales contrib/bc/manuals contrib/bc/src contrib/bc/src/bc contrib/bc/src/dc contrib/bc/src/history contrib/b... Message-ID: <CAPyFy2CMOQ7-k7m_X12PUrSa%2Bz51y%2BV9fMeLjCn9RJ3645m_CQ@mail.gmail.com> In-Reply-To: <ad53e8a5-b816-82bf-3bc7-41696c77d08a@FreeBSD.org> References: <202006271202.05RC22oR085945@repo.freebsd.org> <2b7f0d0f-e243-9c9c-f1c0-e700e0bf6d48@FreeBSD.org> <577b1bd1-598a-d3f9-3c23-537b9747612a@vangyzen.net> <8670f956-1ed4-2b87-ee64-d04bc37d6810@freebsd.org> <ad53e8a5-b816-82bf-3bc7-41696c77d08a@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 29 Jun 2020 at 11:27, John Baldwin <jhb@freebsd.org> wrote: > > I suspect just doing the 'merge --record-only' is the simplest method > assuming Git handles it ok. I suspect since Git ignores mergeinfo this > is fine, but it would be good for Ed to confirm. You can always restore > the tests in the future in contrib/bc when you want to add them. I think a --record-only merge is the best approach; in any case we have a number of these in the tree already and Git will have to deal with them.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2CMOQ7-k7m_X12PUrSa%2Bz51y%2BV9fMeLjCn9RJ3645m_CQ>