From owner-freebsd-stable@freebsd.org Thu Dec 31 10:51:02 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FF4E4BCBB5 for ; Thu, 31 Dec 2020 10:51:02 +0000 (UTC) (envelope-from chris@cretaforce.gr) Received: from relay1.cretaforce.gr (relay1.cretaforce.gr [195.201.253.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.cretaforce.gr", Issuer "RapidSSL RSA CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D64h45TL7z4bWF for ; Thu, 31 Dec 2020 10:51:00 +0000 (UTC) (envelope-from chris@cretaforce.gr) Received: from server1.cretaforce.gr (server1.cretaforce.gr [138.201.248.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.cretaforce.gr", Issuer "RapidSSL RSA CA 2018" (verified OK)) by smtp1.cretaforce.gr (Postfix) with ESMTPS id 8A8041F6B2 for ; Thu, 31 Dec 2020 12:50:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cretaforce.gr; s=cretaforce; t=1609411858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tgyN0hLJLAJuBELF0J+7jNncbaqzjNKhDUc74qjpSOo=; b=LWINbV6l2wEjyCBi+4iGnVwm7i9gN4rpIvsne1TX8bqOjLdxkoe/PCphWKblgf5YXyTfZH eLrhNQjYF/Jk8KFdgvDJizq0FZUKy/ac0jqah8WHSmCpCTDZGkPEG/ZA136hLXZ9vuuBXn LlNghr73bgWJkulIVcUXRykfGbvgLW0= Received: from macbook-air.fritz.box (athedsl-4430180.home.otenet.gr [79.129.137.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: chris@cretaforce.gr) by server1.cretaforce.gr (Postfix) with ESMTPSA id 51F242734D for ; Thu, 31 Dec 2020 12:50:58 +0200 (EET) From: Christos Chatzaras Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Date: Thu, 31 Dec 2020 12:50:57 +0200 References: <202012310949.0BV9nNUC005172@nuc.oldach.net> To: freebsd-stable@freebsd.org In-Reply-To: <202012310949.0BV9nNUC005172@nuc.oldach.net> Message-Id: <70AA4F5E-1CBE-4CC4-8E6C-F60F63EE12D6@cretaforce.gr> X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D64h45TL7z4bWF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=cretaforce.gr header.s=cretaforce header.b=LWINbV6l; dmarc=none; spf=pass (mx1.freebsd.org: domain of chris@cretaforce.gr designates 195.201.253.145 as permitted sender) smtp.mailfrom=chris@cretaforce.gr X-Spamd-Result: default: False [-2.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:195.201.253.145]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[cretaforce.gr:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[79.129.137.84:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[195.201.253.145:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:195.201.0.0/16, country:DE]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[cretaforce.gr:s=cretaforce]; FREEFALL_USER(0.00)[chris]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[cretaforce.gr]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[195.201.253.145:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[195.201.253.145:from]; DWL_DNSWL_LOW(-1.00)[cretaforce.gr:dkim]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 10:51:02 -0000 > No need to. etcupdate should merge back local changes and shout if it > can't. >=20 So I run these commands? rm -fr /usr/src gitup release cd /usr/src make buildworld make buildkernel make installkernel etcupdate -p make installworld etcupdate Or I don't need "etcupdate -p" ? In = https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html = I don't see that "mergemaster -p" is needed and I don't remember where = I found this command but I use it for a long time.=