From nobody Sat Sep 23 16:05:34 2023 X-Original-To: questions@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtDWV1nmmz4ts9t for ; Sat, 23 Sep 2023 16:05:42 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtDWT0nbDz4NFt for ; Sat, 23 Sep 2023 16:05:41 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=Zwt2CBj1; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::32d as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40531812168so40541615e9.1 for ; Sat, 23 Sep 2023 09:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695485137; x=1696089937; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=PyQhh36cqnBSWC8JZ7zDVivvhMOZfCZ5uchcPCDMICQ=; b=Zwt2CBj1CFtwvRm18X2NGyzAtcOBLZOpxXOOOg05FmHzSaMz31K0RnzL3ETyD6pJtn AZ0us6bN3ZUeTBn6+QwvwrqO9pi47P1evNbe4TRG82Nxl5OAVi18cDnytKkFasFHyXP4 fk+8P6lXjf1dSVVIeP7+v4ucs3LWjlpV8NxH8tHNGF9DxJ/8a5QJJSKLQhJmt6vp3+4D p7TcRskn7ec6fzT1X/cWu2uDPDUOnBWUsDZz+TH/F+NUeK+Ou+jehDPoUSTqChkkydw2 essYI0OpKQgxYH1QHm1ohzhbQbEe+noA0SGP2CWwuQHE05laKgP6yt85WJL+JoDdg8Sh TSHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695485137; x=1696089937; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PyQhh36cqnBSWC8JZ7zDVivvhMOZfCZ5uchcPCDMICQ=; b=CH24elNPKxY8Z9vqy3fHLzKwEs9gMb6anUhUTokLu65WgyZVzG9C22QvywBjtkV9WU egiphgTyeYSNmOjwf36oLy4mT8ftRWaIG5d8jWFUB742byk6LrxOO6K2Z9md33gtia+W SsDikc2kuD74Pj/6DFdbOOW4sKjdXLPN72Wy5GKd/+wX9DNAtfmL8MQFPDa4+768W7v1 U2UiYDNED8mR0Tfn0xfVxibFDKdj3C4Oi9dev3IBZ4Azny8xpSg0Hoczf+IiR97xj5im RgyddDE+I9aN+nhAYcT9yUMLWcWXjOFfZcTVCiOXN1fKnFs6baVBVnsxklSbu1Awx8nx WLoQ== X-Gm-Message-State: AOJu0YwCTFnoNtpQ6yTpDVY3irCshgO10WVxdyPrG9qWcWWDsUT7cocJ ZqJhDIARr3Zfi7gSF/B41rsFSqLauDXByw== X-Google-Smtp-Source: AGHT+IF3+8D4vQR27Audc1QY1dj2yIKtNkkpnBYUGedd7GkKht/Nufv7d+dctmd1ehwnVo0MgyV5zg== X-Received: by 2002:adf:f891:0:b0:320:66:cf67 with SMTP id u17-20020adff891000000b003200066cf67mr2070260wrp.18.1695485136739; Sat, 23 Sep 2023 09:05:36 -0700 (PDT) Received: from [192.168.1.6] (80-42-66-93.dynamic.dsl.as9105.com. [80.42.66.93]) by smtp.gmail.com with ESMTPSA id gy6-20020a170906f24600b00992afee724bsm4057218ejb.76.2023.09.23.09.05.35 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Sep 2023 09:05:36 -0700 (PDT) Message-ID: <9d5bde87-ff01-71a1-7b48-992545c3099e@gmail.com> Date: Sat, 23 Sep 2023 17:05:34 +0100 List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: Upgrading from old version (13.0-RELEASE-p4) Content-Language: en-US To: questions@freebsd.org References: <73cf476a-d113-f724-8a35-bc6ee6fc88be@Julf.com> From: Graham Perrin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.89 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.89)[-0.889]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[grahamperrin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::32d:from]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[questions@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RtDWT0nbDz4NFt On 22/09/2023 00:54, Eduardo Lemos de Sa wrote: > 6) … > > For future upgrades, I suggest: > cd /usr/src > git pull > followed by steps 4, 5, and so on... > > … > I'd use --ff-only for the pull.