Date: Fri, 27 Mar 2020 15:30:08 -0400 From: Ed Maste <emaste@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com>, git@freebsd.org Subject: Re: Strange commit Message-ID: <CAPyFy2BcEgpuK3JDa6AUGsoGxwKmY1ozk-HqRNarvQMGtXFpwg@mail.gmail.com> In-Reply-To: <CANCZdfpoROXZOn0CdX6w=TK03FWc-f8sR9XJQ4cxb_Mq9GBUqw@mail.gmail.com> References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com> <CAPyFy2Dm12BD4yuGo65T_tQrGXapZxvSSurO=Gwn=2S1drq6ig@mail.gmail.com> <CAJ9axoRs9zWXteeDmZ8L1nucBPqqB-WMGuXTRFyVuxo2h4F11w@mail.gmail.com> <CAPyFy2BgeP=WxeZeYVS3z%2BgzArJe1h9ofO42O7HvznpLBsBKbg@mail.gmail.com> <CANCZdfo8m4Kg%2BXTbUJYwi1gxOr8C9RobBR0DcZ6D6veiKkOB2Q@mail.gmail.com> <CAPyFy2DROg_v47QrxmK-1TuFzqTqf=2e63N7qoX1_V=GyDkyRg@mail.gmail.com> <CANCZdfpoROXZOn0CdX6w=TK03FWc-f8sR9XJQ4cxb_Mq9GBUqw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 27 Mar 2020 at 15:12, Warner Losh <imp@bsdimp.com> wrote: > > The vendor repos we wanted to do would be complete on their own. We don't= want the revisions of those repos in the main repo. A merge commit would m= ake us have them in the main repo. Then again, maybe this eliminates subtre= e if we can't do that. It was why we were looking at the other one: it crea= tes a repo that is independent of the merged in repo and it requires no ext= ra modules for our users to install. We do want revisions of the contrib code in the main repo, otherwise we lose the history and the ability to easily maintain our local changes.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BcEgpuK3JDa6AUGsoGxwKmY1ozk-HqRNarvQMGtXFpwg>