Date: Mon, 4 Jan 2021 19:31:05 +0100 From: Andrea Venturoli <ml@netfence.it> To: freebsd-current@freebsd.org Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <c016e4c4-c3ee-d554-cf6c-472eae47810b@netfence.it> In-Reply-To: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> References: <20210104123512.0f5e1b01@hermann.fritz.box> <X/MKNnDIdd/mCUNP@albert.catwhisker.org> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <CANCZdfpGeifVQJENJ7Tk1LkMwk_NUK_U37h65rHw%2B6jtzv5Uwg@mail.gmail.com> <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1/4/21 7:18 PM, Warner Losh wrote: > mergemaster has been on its way out since well before the switch to git. > It's been disfavored for at least a decade I first heard about this today. While I don't have any opinion on this, shouldn't any reference to it in the instructions in /usr/src/UPDATING be changed? They way I read that file is that mergemaster is still the official way to go. bye & Thanks av.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c016e4c4-c3ee-d554-cf6c-472eae47810b>