From nobody Sat Dec 03 03:03:11 2022 X-Original-To: freebsd-git@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 4NPF4d6JLYz4jDy7 for ; Sat, 3 Dec 2022 03:03:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-55.consmr.mail.gq1.yahoo.com (sonic316-55.consmr.mail.gq1.yahoo.com [98.137.69.31]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPF4d3TBhz3RGS for ; Sat, 3 Dec 2022 03:03:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670036607; bh=OH90h7+h+apqmij0I6+d8Nni5636Cf+FSzE7KVgMQ6s=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=Vjgru3gI/zZrLwYdqkX7mE9ouHugiA4u565u7PIUQcNt3bFWv5W8CoNKY2ZaWzliYgGHFmThd98kVoWmvygNfTD5qKZgzEZkvbi3DzmchaYKVphoy2MrCxSg/4DArluZzJ+EiuosQVrBHDUuf0+9taqO6Llh/wqZifVXZ0NZiTolhANNoslAGtpCN0SHtRP2HzGgnyax31izvPTTHwK7QtELoY6qnyHyJu4enwe6ICol/Uqt+0d1pJq/JCzD4p9aZ28TmhkcNLTDQY33nsC6GtZVTtcFXXMSZ/7GzWatOIG8KgShzZ6+PDF6bS93mOMdIjQDKYMo4DdL3I1H7lANlA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670036607; bh=kY8LEbsdOHeUXFSJr6H+juO51YmjvjHtMtDGmSHHZM8=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=YSEi3ML6uP0Tj5KVElXYdc0kwQvueFl6pHtJBgKvIEXTq/g/nDqc3fSsZIMzEvLZH6ljGTvhSQY08DR4bgH0UBEOAwnAPVgezqAtuiyAUlUl8YpSK1HzKG7JQ9JvXyFE/jUxOG/4i/8cHOo1kw7xxAZMKwoBJ+qrY5NhH0AmCTV1OLXKWv4r7fgiMdiP7fXCjoLyvHnvjHJ4knhJA5nmiLWTBXtKt8BzlQB98U99bMadj8ycMBoJGeHKLWoCgdZ/tGEiGbbPJ7+P1ccZlVooPc144U3ojkhAEsLvu2mrxYNw/cnfcaUFL7xymekrtSk+4E9kJDO0dXSLgivW6WM+xA== X-YMail-OSG: bHRigDIVM1kZoqmZ20SsBVYZkGp5adU.StHGdo7OlLMTKxNUHLaOmcL_QkyFQus Vgzv9u.vGQq_Qw2oqYT28dUoMm2VYrOukD2Xx5SUlP7jH2bKbjFkQVOk8feoD7IXI6vS13spA.Pj _Pxy5O5.rHozScsymvvIzSQAe_KqgX66W0ZML.nYylAZimbUTT2kUDYAkGpMTftgzuyuz5JWQa02 powV_qNqfiTNIrOFRPS7nGtjh4HTNk1p5HX23JAZbySqSlGHzXQdtVcPLq_XLgwJluoTSaACz3VI 2Ve8mW.xXdEU9RkOmlZOokgn4mG90.6orVnQLhH9tsO_irCPHbqmLu5eB3WiNoL7gDzG3d7ukSLo kVmp.RYPk7l05cRos7VXVDZ3khX5vb90ZxIbcu2w9pQBmkJvaIFUcquSG_2_hHm_8ti7l_XlMb3K zjQ0e.M82EhJx9lCNtB7Tw2RUwljW3nmm.dqIQ6ka2Nb6leWvEnaD6JBIGWIoyIIglZT3FKr8WOK Px_WorUTpv9m.U4PP2.7TZN_dSuPJauOiuaNhw6Ssz2lCzYI5qCHio5rhN0LHwFEbuYDid0hK1pi CfF9QZjztgiYu_h2Soitc_LweYpZ8IUhZOb_HvJNYUUlcAWKYC.uyYZStuBv3Kax7coqgWpSK_UB keBB1vXZ_YbBQIRYnY8KvLcO6GXMkEdQl0NfgNGwfyBSQkoU7Wm2hkMJy2hLPX5HsRfjUYjv2.fS Ye92af9ruafqjtbncAwlEu49jbHIWtTy2AQCMFyqm79iCEAu.wBNanwjMzRHYbPrrd5W4.tkqMcv qdIAV80QN2ZOyZRugzfXxRIaLvh9zhx5qNvtBH5oDiNysdlW.vxDrNYDDdgROOWJpuxQTg9gLDzQ wgSoIiNs2zABvfKa_zQCwbWvAOkXFiMBTpvHYbwVcGfy0lJ3YD_fNtzxqcGmAtj4aataPkFSMEwE h8O89iVBP158hdeO6.721pXzWec0Rx6bc_iOFtTc68puem2_mZtPgYDQWtvwQ0KmlXdzSyErwURD F2w1WBywi_1PL84Fsswm7tHDqggM53i9HvtL7DFNdx4Pz7nOAsEBAjCZxm1NsGyDSS157pOZUSjK oB8K6tee4Zytigo_FclXue249BsrqcK72T3vBi5DexVSM_Nvxa3hRAaLflHDFG18TkAcbdPQRkqM 3KQF6vETFm0O8nHkqaESNA0vj2Un7MaI1QbXXE4FW6ZJ7RdxxIGodRzS.NmFYZ8mOMRhm.0_tuHx kpst4zkNYpElxPsOg5JN04IpFTQztUGKUZOsp6MbU6ihlZkIEEOti_X1d7G0reEMBGUaWYVj2mQ. kveiKtqq9O3X6Pvt11jMP_G4N3irDvoXvqWiukzWiZ3Wn5LqinfBQ5sMOWrXHeE7lyw7zF3VtgKA aC44U.o1Em8uJvu0Gl.fs0nDjGYoe4OSz_5Z9rqc7Bm6dtfs9V8HQUXJy99dbNJDpvZ8mHaU_Y56 .Sah.x4054wx7vAoC1Skw0OwRyleiArcbKYI_lYA8flLRldKUx2L8.8U7peNEulOzW8N.1G0lGgQ FUn5EVcY4dVtVyjIldykr.79wbm0N5THncLRNbY3d.CbN88Xp3KYMPEk.8gD0wMRV6GSQXOksseU sewCbWIJtSkEe215CXnMike7.WMS8iAplDmZQLaS59Ku65RtUcfF5cJwmL1BjgxMajmIw.bclQb6 dRwi9BuLv5PUzk.nJJUA.HeZc4PQl3IZwWK7uI7RfwBenMkvDsXu8bwa.uXIh1wChJ.zPLoaxUCx 2Io.r2T3GT8_WMT.t7oAbAFftnKzDVoKUegycL0N7VnwSaIRtYCnOQ0SfNijBx05jGvonsb4bCQ. W8duNHgiGgjIuSXle5zm8xGUkW.XAC1ULO3bD_F3fyTkwH02vJjUz4xEcqJu415M147VlNl36xUR vh45VuSYQVF1iL0lbRfjSxTgtTTQS8Lsmi24eTDcR2WRHsnLuC3qn3UVskEwL6DfQ9I7TpGwPmk5 9PUDuRHemDyURUaAmw36ynbi0OjehVAxRptZUyc4RQ3Kkz72QiPV77GTtxiiGWOEd5pNiCvGn3ZZ JhRlhN8C21WFmJiGmbBEyw_vAeSYllblgKHLyQr0puTgPqjmVCIaft5HHiHhXSmO6MPchSNn4miB WCo5_.WIb_FHVxwzRH3gNZaSmfMSKNQVkojKX_7mJvhKegAyF.67wGAAOtE5rhvay4BdVrn8wWuo NnjrlRGco0iRYd3WtB8UXyfT3oFnmXdBgf.D_JOuLZyAPbbQSZYSyLIzF3dedWwqXYVjXZscvU7M - X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Sat, 3 Dec 2022 03:03:27 +0000 Received: by hermes--production-gq1-d898c4779-kmgvg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 7548267b4845e068c34afb0d1bc6896b; Sat, 03 Dec 2022 03:03:25 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) Subject: Re: git-switch(1) then git-pull(1) From: Mark Millard In-Reply-To: Date: Fri, 2 Dec 2022 19:03:11 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2C2E55E9-3D3A-4C5C-A7EA-69A77C5D8511@yahoo.com> References: To: Graham Perrin X-Mailer: Apple Mail (2.3731.200.110.1.12) X-Rspamd-Queue-Id: 4NPF4d3TBhz3RGS X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Dec 2, 2022, at 17:19, Graham Perrin = wrote: > On 02/12/2022 12:08, Nuno Teixeira wrote: >> Not sure if I understand but I use `git switch` on ports tree to = switch from 'main' to 'quarterly' to avoid having 2 trees. >>=20 >> e.g. >> When in main and need to do a commit on 2022Q4: >> `git switch 2022Q4` >> `git pull --rebase` >> `git cherry-pick -x XXX` >> `git push` >>=20 >> and switch back to main: >> `git switch -` or `git switch main` >> `git pull --rebase` >>=20 >> Hope that helps >=20 > There's the statement after the switch:=20 > "up to date" > If the branch is truly updated, then what are the subsequent updates? = (The pull immediately after the switch.) "up to date" is not explicit about what is up to date relative to what else that is around in various places. git switch is described via: Switch to a specified branch. The working tree and the index are updated to match the branch. All new commits will be added to the = tip of this branch. What is up to date is the working tree and index relative to the .git/... vintage that you have and only the material from it for that branch that you have switched to: no longe rmaterial from the prior branch. There is "git fetch" for updating the .git/... vintage without updating any branches to use the new material. Various forms of "git merge" does that second part --but only for one branch at a time. I'm not aware of a command that updates all branches all at once to match the updated .git/... material, much less all working trees and indexes as well. "git pull" variants do both a "git fetch" and a "git merge" for some branch. But it does not update the other branches to track the updated .git/... material for them. One does not normally deal with an overall global "up to date" status in all respects for multi-branch git repositories. For example, I deal with branches releng/13.* , stable/13 , and main [so: 14]. But I almost never do anything with any of releng/12.* or stable/12: so, normally no merges for those. I actually normally do fetch and merge separately, doing multiple merges of multiple branches over some time after the fetch. By the time I'm done, the freebsd repository has probably been changed. Basically, rarely or never "globally up to date in every respect" relative to the FreeBSD repository and my local context, always just some more specific, limited concept of "up to date" that is of interest to me at the time. =3D=3D=3D Mark Millard marklmi at yahoo.com