From owner-freebsd-ports@freebsd.org Fri Apr 9 10:12:04 2021 Return-Path: Delivered-To: freebsd-ports@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 578415D35FC for ; Fri, 9 Apr 2021 10:12:04 +0000 (UTC) (envelope-from simon.wright@gmx.net) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGv7R1Jw4z4Y36 for ; Fri, 9 Apr 2021 10:12:02 +0000 (UTC) (envelope-from simon.wright@gmx.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617963121; bh=0X/YIEN6e3TSRqZ0I2ahnw0vkNp73MQLg+Tr7rLUZ8c=; h=X-UI-Sender-Class:Subject:To:References:From:Date:In-Reply-To; b=TusbU1NtsaPlBYA9pg1TFFTL6jITujS4gq4+mv1My4iVJB6xw+BUYIMss3Hc5DN4D lTKy/zvKLxVlrxZMUXg2Lm4J6cJf61J5xqqPhcJeXsbJkLHenmqHeTSmLxJW8TKVeq 95RMZZXaRJCcILX/SuaJxSwL7JRAa9sYJ//05JgA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.79.199] ([110.54.219.230]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M2f9b-1lYvmx3EvX-004Fp2 for ; Fri, 09 Apr 2021 12:12:01 +0200 Subject: Re: Specific svn/git package update use case To: freebsd-ports@freebsd.org References: <8D6CD370-25E2-42C8-ADC8-B26D187D8577.ref@yahoo.com> <8D6CD370-25E2-42C8-ADC8-B26D187D8577@yahoo.com> From: Simon Wright Message-ID: <59400e9a-5cce-fffd-decb-276dae1814ef@gmx.net> Date: Fri, 9 Apr 2021 18:11:56 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <8D6CD370-25E2-42C8-ADC8-B26D187D8577@yahoo.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:qnEAa6S911Wbm7Jea3RMAC01uBGTKkvaOgRudJLJPVq5dYgY4cp Krbtsxo1fNSz15hzMolyKZhrQeIb2HaSrfNwMi8GHnrYto8eNqRa0hs4HmUKhhZkTOG7Vld +EfqYllrhYF3NrUJ/0IwiKPkdcbek7SX+lef/jxJNMu9bcrHkL7uVjickt2GARL0uSp+zfd jhxcn8hhLGmE52u3uuSsg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:EdUb/vj6nm4=:jVc5Yti6VBsqZpCwo/Oo9U 6SaCStVoCbrJBvg8MYCzjjuCY2e04ldSziXhm51VzOkfqmQbTUB2TkKtwFXsTRcLbF3caEI89 v0CH7LyHgOkOxNwwWacNGpGxMk9jylHANvFLlj8OHmacl1EGvZV8tdmryOE6yDZVDlsrUX/S9 CL6d4isbjKIS6KTphFZ9Y+FKdLEEtoTLE06TKfxiwtJ6nFEc+aEZCnwUSUi5Y2VkjCK9BodxQ zvGZbTpcwP2q8RawD6iHAGkU4KRNTLBkoewGcL6yva5DrASmrcsv8fSGz8v1V8oHltNgCoe0Y D2gxlwjB0xstJoS/7U9UG+Hy09eLdoLfSZxt6mBmGje2dVmq8wX1QUZrXUn1QzbdhumAYtIv2 GlXkApEcIk4E8AnbWbupBVvezZHN44OJ3/0RA2rpWVraQCs6wCJBy7QuBxomFfuOcV9JStnKB SK7USuLj7ag99VMA2xogmHhn9Qe1aChvyfGFEPpob1gnhFwFcSw8NjayNR4QeBwN1gXmuqbbB Zc8lBuYFFJtvBi9EHbm9fV1l5fkJCixLDVEL180oLHaZR7ss1ma8jJT2EmZBXPwQtAHeZSH/z XXRZcsMZSvnFNH8sbG/w7X35eG0GpGgqBoLcRZkNmOvQ58EepjPPHb4TwwNKmHnzXeBzSOlKv MBMRCP/zaUGYrSXvouv0Lg2/ieUJKnAcEgIQeX6lUd9Pgvn81c3ffKKD5+9NlrKeRq/AU7eEZ unmHK35cmXVlHb6adgYvI9vN6eEqpwib9i3A5qU8rRha9TGkU2wAeyByy2cTT31XrRr1hxfEg n38tfxIupQxJhTmF1AjRnMO4ALMgYgGEyNZ4MLDGgK4LcqOMasgHX1pukuvU5fCsBzjmsIkj/ NfqRKt7ymQFrQ6k6PWjW3XiyRa9cP4A2mfIiQFYTVVs8Y/yJS+fgNhYQSQq8t5W3t8DCS9GsL MUVSYr5txu1OTQVrcsatxWVldzEUSSGJ65zOJJfZwgk7G02SKF3EhaA2rMYvFSla0bEh94gfD jrN0C0xSCp5P4JzGvfVJHd/9SSgjJJsGoJC5kroYcM5IvKk8cIW5tNJBtFbBW7QqjUk3sbj90 SpVBVAsaIlEIHS8t7uFv4DDjyDX9McwAWQNtd+2kGapcjDVA2oL015rhHEONES29TQTC59scd oes7huaFhs8akDX1IJi9Gpf9uZJz8TRlT6L2v7CP2EQkNHn0VRVnpJxuaet/vDJQoCFJk= X-Rspamd-Queue-Id: 4FGv7R1Jw4z4Y36 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=TusbU1Nt; dmarc=pass (policy=none) header.from=gmx.net; spf=pass (mx1.freebsd.org: domain of simon.wright@gmx.net designates 212.227.17.22 as permitted sender) smtp.mailfrom=simon.wright@gmx.net X-Spamd-Result: default: False [-5.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmx.net]; R_SPF_ALLOW(-0.20)[+ip4:212.227.17.0/27]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[gmx.net:+]; DMARC_POLICY_ALLOW(-0.50)[gmx.net,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_LOW(-0.10)[212.227.17.22:from]; FROM_EQ_ENVFROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[212.227.17.22:from]; FREEMAIL_ENVFROM(0.00)[gmx.net]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; RECEIVED_SPAMHAUS_PBL(0.00)[110.54.219.230:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_LOW(-1.00)[gmx.net:dkim]; SPAMHAUS_ZRD(0.00)[212.227.17.22:from:127.0.2.255]; RWL_MAILSPIKE_POSSIBLE(0.00)[212.227.17.22:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-ports] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 10:12:04 -0000 Excellent Mark, thank you, then that is exactly what I need, the git equivilent of svn up -r xxxxxx ${portsdir}. And is there a need to do git-commit or git-merge to deal with the 'detached HEAD' message or can I just suppress this? Any local modifications live in an overlay for poudriere to use so there is nothing unique in my /usr/ports and I only track main, no other branches. On 09/04/2021 1:23 pm, Mark Millard via freebsd-ports wrote: > Simon Wright simon.wright at gmx.net wrote on > Fri Apr 9 02:48:47 UTC 2021 : > >> I'm still not clear though whether checking out this commit brings in >> all the commits from git clone to this one or only this commit. My >> reading seems to say that this is *only* this one commit which is not m= y >> need. Can anyone confirm this please? > > [My wording is not trying to be explicit about multi-branch > merge points. Nor does it try to deal much with if you have > local changes or staged changes in place at the time of the > activity or if you have extra files not checked into git in > the tree as well. And so on: a simple same-branch context.] > > A commit hash/id identifies everything on the branch at the > time the commit finished, including what did not change > compared to the prior commit on the branch. Checking out the > commit spans all of it. Jumping forward (or backward) a bunch > of commits on a branch does not require doing them one by one > to get the net effect. > > You may want to inspect after checkouts (or similar activity) > that "git status" does not display any surprises that need > to be cleaned up in the local file system via some variant(s) > of git restore or/and git clean or the like. > > =3D=3D=3D > Mark Millard > marklmi at yahoo.com