From nobody Mon Sep 25 05:37:14 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 4RvBTn1yMSz4v4Wv for ; Mon, 25 Sep 2023 05:37:33 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-yw1-x112f.google.com (mail-yw1-x112f.google.com [IPv6:2607:f8b0:4864:20::112f]) (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 4RvBTm2nWvz3gRm for ; Mon, 25 Sep 2023 05:37:32 +0000 (UTC) (envelope-from kob6558@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=e1hwpoHT; spf=pass (mx1.freebsd.org: domain of kob6558@gmail.com designates 2607:f8b0:4864:20::112f as permitted sender) smtp.mailfrom=kob6558@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-59f4bc88f9fso39315927b3.2 for ; Sun, 24 Sep 2023 22:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695620251; x=1696225051; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=GXnkxZ5TUhPaRGe2X2gRTDN7oNmvW+8omMY+saTLKJQ=; b=e1hwpoHTA5vAJOMH084t0YWLpSSR+hFItsgR3Z6MUKq+D/1hFpXVM82OlVgXaaevIX 12DiWnUyOyb/bgZfTDWsArv+MOZ8odvRMeHrEEm01M1GYQyCU2pibqy2ir0h3gEJMmab jzFy1MsCK7j30cZzh21L7UCggiy6QDUAoDWWL4pIfs+e/w+10rDGC1pNsnhg34s22V+U se+ZBqspcy0JUvY6Jw28KRfdWQolEAfyaczHMR2nJJCrgJKqFKiEmWI1MVFgMFaeLLxT Talp0EvnYO4A6C0HekPftRJoNf1g92h00t3rGpcq6Ec1QM9gnV4eClWWn8XxOhpnj1Di c4QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695620251; x=1696225051; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GXnkxZ5TUhPaRGe2X2gRTDN7oNmvW+8omMY+saTLKJQ=; b=TrI0fBeGYFQks+IgeMAPRbUZKa6KfGStA+9j3ztIxsD1lOf2uAsTxtbEpdVpDq+PSW M1DS7qPgW1p2s7A8FgRdNMmAZcZGBT8D4i4msmDNTcQ1lSiqTF+eDai8fPFIskLSbeaX TpWlcxGUgehi/y7W75Fekl49pzmN0yh4bs0NiNdd+EXy+wg7VNSZzDUT6wjTfA073FcQ 5qjYsr6BrM4vJEwbNmL1AHBrkdfdqEwff+Ft/K8ZyWcy7ruMAR0NUg7pQoYUHZHegYge y2f/vSnKUPicAqIHweJ0VOwUEhp/JL3UbJmAXWyzTOvJbPucRijtcaLaBx8T1yr69egZ UVMA== X-Gm-Message-State: AOJu0YxzNydbZSkR8aXwvYcaMyuEOlSBlEiA/gqZCOv+GpF2pNFEVaRy W0NqoXK2VCC6MN29tQaMRwyiDdNIxQ7VSQvRI6D9AZQ9IVs= X-Google-Smtp-Source: AGHT+IFWUwmV1zon/3c2NmIul9ptcMJJVcBAqE6gU2kht1smPW44jS9Mus55yrlByaSSxIzynT2MDEQ1GYf2K72RTQI= X-Received: by 2002:a81:6d96:0:b0:59b:3b79:abd8 with SMTP id i144-20020a816d96000000b0059b3b79abd8mr4507548ywc.1.1695620251217; Sun, 24 Sep 2023 22:37:31 -0700 (PDT) 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 References: <73cf476a-d113-f724-8a35-bc6ee6fc88be@Julf.com> <9d5bde87-ff01-71a1-7b48-992545c3099e@gmail.com> In-Reply-To: <9d5bde87-ff01-71a1-7b48-992545c3099e@gmail.com> From: Kevin Oberman Date: Sun, 24 Sep 2023 22:37:14 -0700 Message-ID: Subject: Re: Upgrading from old version (13.0-RELEASE-p4) To: Graham Perrin Cc: questions@freebsd.org Content-Type: multipart/alternative; boundary="000000000000bf73d40606285aaf" X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.18 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.48)[-0.475]; FORGED_SENDER(0.30)[rkoberman@gmail.com,kob6558@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[rkoberman@gmail.com,kob6558@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::112f:from]; DKIM_TRACE(0.00)[gmail.com:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_TO(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[questions@freebsd.org] X-Rspamd-Queue-Id: 4RvBTm2nWvz3gRm --000000000000bf73d40606285aaf Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Sep 23, 2023 at 9:05=E2=80=AFAM Graham Perrin wrote: > On 22/09/2023 00:54, Eduardo Lemos de Sa wrote: > > 6) =E2=80=A6 > > > > For future upgrades, I suggest: > > cd /usr/src > > git pull > > followed by steps 4, 5, and so on... > > > > =E2=80=A6 > > > I'd use --ff-only for the pull. > The git documentation for the pull command claims that --ff-only is the default. Is that incorrect? From "man git-pull": --ff-only Only update to the new history if there is no divergent local history. This is the default when no method for reconciling divergent histories is provided (via the --rebase=3D* flags). --=20 Kevin Oberman, Part time kid herder and retired Network Engineer E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 --000000000000bf73d40606285aaf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Sat, Sep 23, 2023 at 9:05=E2= =80=AFAM Graham Perrin <graham= perrin@gmail.com> wrote:
On 22/09/2023 00:54, Eduardo L= emos de Sa wrote:
> 6) =E2=80=A6
>
> For future upgrades, I suggest:
> cd /usr/src
> git pull
> followed by steps 4, 5, and so on...
>
> =E2=80=A6
>
I'd use --ff-only for the pull.

The git documentation for the pull command claims that --ff-only is the d= efault. Is that incorrect? From "man git-pull":
=C2=A0=C2=A0 =C2=A0=C2=A0 --ff-only
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0Only update to the new history if there is no divergent local
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0history. This is the default when no = method for reconciling
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0divergen= t histories is provided (via the --rebase=3D* flags).
--
Kevin Oberman, Part time kid herder and retired Netw= ork Engineer
E-mail: rkoberman@gmail.com
PGP Fingerprint: D03FB98AFA78E3= B78C1694B318AB39EF1B055683
<= /div> --000000000000bf73d40606285aaf--