Date: Mon, 4 Jan 2021 18:14:35 +0200 From: Christos Chatzaras <chris@cretaforce.gr> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <E84F461B-5CC9-4208-AC02-1966F484482E@cretaforce.gr> In-Reply-To: <F9B34E2E-6897-4A4D-8FA9-11BF90E470BA@yahoo.com> References: <F9B34E2E-6897-4A4D-8FA9-11BF90E470BA.ref@yahoo.com> <F9B34E2E-6897-4A4D-8FA9-11BF90E470BA@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> I do not remember mergemaster having a bootstrap stage in setting > it up, a stage that should be executed before /usr/src (or whatever) > is updated. So the procedures are different overall. etcupdate does a 3-way merge. What I did to replace mergemaster with etcupdate was: rm -fr /usr/src svnup release etcupdate extract rm -fr /usr/src gitup release cd /usr/src make buildworld make buildkernel make installkernel etcupdate -p make installworld etcupdate make -DBATCH_DELETE_OLD_FILES delete-old make -DBATCH_DELETE_OLD_FILES delete-old-libs shutdown -r now
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E84F461B-5CC9-4208-AC02-1966F484482E>