From nobody Sat Jun 18 21:02:38 2022 X-Original-To: freebsd-ports@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 BD274861865 for ; Sat, 18 Jun 2022 21:02:53 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (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 4LQSzc2Lyxz589W for ; Sat, 18 Jun 2022 21:02:52 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1655586164; bh=vcCa+f2SbrSNLPIJKSvMjQGjVFZDm6hsZ3TINUZ3cmc=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=lYQajrijFUQrUikqZxsio/Sdo3C+4uBqLZfSpJ8Ade1S1E18uzrhIluzAX3noTRRrHWMaUHF40tlhXRdP0RYfrhKxtHAnHPyKKbBf4+4/NQg0lBF0G73dFB97AqUD+tuLEjO9Uzp9BYfctvsXvw3c+3C8V3EkI37bmNFtkUitA9Ff+tYfFhzU5wRRQS9LQjIuXXrSF1z6KZWonI23KQNMaHS1DzNM7zuk2rrGCz2niE/EIrKjYxg2MhfZUNTsjYco1umsEpK4ssork7l6zJdWtu4CF4R7+/HZGAcHBxuJOvf/6a05CVFEucT0cA9rMcq3FROWty4PQilrpfFsWvPMw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1655586164; bh=fGIozUR8R7tI3CsdgWHECJ13d7GFK5EViybTSQPmFQa=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=A/jE3+gCxBJRdk9m+JY2WhVEvQoAKvyjSuDPNQqUGEcaNCgK7/d7afbn1Td2487JccyIH4dhrL8KgfRnq+2lYK5YKgaVZgnUWyUkGnhCUJBegH0qPVd7a/D/W+zfVDxc2KxNFId3+IbkPwtdGA7VXmD7VGZPYsqBer0ZhqeCTqeHFHHvXBbNUgA8KN2RvRm20aB8R9DC3C9kVcyoeXc1FZmNa9Say6vud2yByDABwgw8SLBnkNeel7Y037J/NCUg6CaNWPdLCrMRZy+Ag3LfjZRkJBemj+odXqMW10Ak6vi93U2K+WZBZ+FdRtpkc48FWlmmG//f+A9B3p9/ggVu8A== X-YMail-OSG: WjWnA_MVM1naI.m1guXmnRY52PMc7gTGcyh_b2i1939pwmH2uwL2nP.z17rjZ0P q3AalHIBWq6zpfI3GLvgbarIzQJhN80AOYh2.z_5WbB6wJoL32UCRDAiox.xYvdSVhrbo88nDED9 MVO5ZRT7ded3c_nDyN7F_F8gWq_3rVIuocG7ZEe6uUL7svdZhUUPs2tsxiTyTcR34RLisZeg_PTg kzt4Aa6upWsfDNgY9pf9gatQBKhqawukV2mjD5eMascX0naxbKT5GM8tcutxwrDzqpqUoKKrE3M9 aMuXVJ7LgL.Gag_4pjgvfvLEcGi6NqVVA7i22fk9a_z2TKh8mbX9DzdO3InwsKQys.gHvbxXtVBd yMArFg78tTxaRTE8UkQ44VMRp8hEbroIdAbwHS9rCHYbt8n.ItFNG.A.tpEyQtiw45aajaBGi5ni nKo_ebGpnUP0EKf8489lPnnqcFMEBAcUrZZ2dWpp3JFk_I_3otNFb3AY7TNqxfXW7lhlsZOgg8VN eFPvyWfKa_8aHMd9gnWFLtphdJKLwicjgrFufyTtGeJnSP6tGDnUTUfrAreAkwAQyaZlvxFyKONr W2.qdqc3LnG2CIywfH0Ck4Q8cqu1WTqGRXliViBULQe4dhzHaHMpD4Z0SXgkGIs4iSbwf0hmluN7 LoWp.edZQdOgCOBnZ_dotUCUZJyc2VplCNRdlfCSyYPd34GQL6UCP3JjmdzehbmgQF41_L07IMlk CAbwN7MgtASH8RhYs29pZRQ12Hd3C7jC4r4jQV_SNygfFkoocf52wXUMnKLOH89GWvT6WABVLhY8 Ogwx0Ttc5qG5NQptQO.6Ta_UtOlcrFqF5HtDXM03qGSsEo.K5i5cQ81t4fz6tUJO3ZMoeCDdkeew JNSxPH6HOexX7q7bnsuEFBSPnandSAkTeKwecCzxPRBItZ._Pp.qVv8IBC2_H_GVXGuBkBvxZyxx gPZyKmZ1BQGrCxjRQKqithszIPKdz0ph1AQ4Xc.MJjERjY7JKWAhKje3aF07t8KTRXd11YAJFnst GUWzPcrnPdgVctpQwFC8lUdNR0j6gbTUg47FyT8Z2w1pkTt.KeAfOhK6irpg5w9ef_Juz4gg64dv pWDBksVAQc83n3I559luYaBXboaLglDiqvh.ds1OWSR7ygIP1BCtsgqcN9FNsg3gdbsfiC.fWBh8 EEbo3qBSk_OC0Rt2ffqKsnnfphddan0JFMVhT0oLbB6c_YJVchmNKjdsMfNHGQlo.uiLPSPK.ikZ WQ1VI3Grcjek4Lr3UHlGwv52rI7EUBpIJHp699ZnfGXYXYiMwPL71LDWs07_Wl8iJqVHps9i_zxL Cg00W8bQGq52FkuquusAhNneBth7Ofl2d0aXIpDeDEp6BcIXetDBLEdFsiSzl6roTWnjZjv_t_Nu O0mZ5sVGuYjhWCMSqVAuAS0_X93AgoAHsbfT6AbDc7Uka2tsNdUG2lQjoRGGD9AzdVgH1pW9D2Zl 7tOucCbvDQzd33m8sIy55G7qzoy4f1DpwHgN.Dk5iAkW6F8Wuc.cPgmP8vCEwEbb.pOagJ56pGcn Dhu5ChxQQn33WAhlKpXIgGW0EjQESpL6zIURAyk6kkyETMVghGjIalcZBf2GRxZl5L4J8ed9GPNL SFKXHdqDQugSMdjjCszhvrZN.FSHfobP10pkm2NnjLcwOGT_a_eorRPSkmuD27gONXj2gjUPmbbU qtwebo8vUV7CBLW_o9qZq_7PiEfmoEJmHhqZDzgbGH9SsEMj2CCEr3cT3JAFWnIGw7eW874FO6Ka 8aWPyViKWsfw1LkHxPhjyeZ8H0fw2k.LoX338VMbxTMGIIkpfxiLNWQmrX1S4k5ghzyiyH41SlHw iU7C_K6LcsJuh3sux3vR1tu06Kv1KEaA_2_cq0IGomthOOuJeO5Xu92FB4ISWvwFmhMaY02eQiUm HTjGvW6P4A5yWlPADGPUSC1j2Qp13RpMKY7GuKNuK.KdikTg7v1Q48aFGtWcvOQHUE0wUpnkjII1 D31t.9EUtl.B.8TwEbFLl.AR5xexajVp0mObgzpkfc3t2537WqLwh9yWU1P_rVS.ppg5LGxosflt rM3DDlZY7gzFUJ9clOjuDVNiS_j_FDkUNOwOz.olIxHSxI9TfOg4oBBpr5NnGczC0UuA6uTnaelr gN9pvB.cbMM1vm92r.mci1YGfU8Ofbm7Rfa1u1FaW5DNZIACA1YZ4.xg5Db1LWvZCg1LvVDf8Fkl XWRzYyTLtll51IDJjpnNq1nsfqlO.l8eIChwR9ZIijqunHJzWdPIqpT7QD7alWAtN4wINuF0cO89 uSmxx9R2OtPtT14Pu2A7VlhyeIzG90eRLOxPc939pFGQtj6WUZriS X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sat, 18 Jun 2022 21:02:44 +0000 Received: by hermes--canary-production-bf1-8bb76d6cf-qm959 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID cd6a3a66f64c480ce34b72ca04482e92; Sat, 18 Jun 2022 21:02:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: git pull not replicating? From: Mark Millard In-Reply-To: Date: Sat, 18 Jun 2022 14:02:38 -0700 Cc: freebsd-ports@freebsd.org, grembo@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: References: <9038328B-04B5-47BB-9526-4CB8B94B9C53.ref@yahoo.com> <9038328B-04B5-47BB-9526-4CB8B94B9C53@yahoo.com> To: Andy Farkas X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Rspamd-Queue-Id: 4LQSzc2Lyxz589W X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=lYQajrij; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-0.92 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.58)[0.575]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from]; MLMMJ_DEST(0.00)[freebsd-ports]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.147:from]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N On 2022-Jun-18, at 13:24, Andy Farkas wrote: > Thank you Michael and Mark, you have increased my understanding of git > such that it now makes a bit more sense of what is going on. The many > many git manpages I find hard to comprehend. (what does > supposed to mean?) > > On 19/06/2022 3:13 am, Mark Millard wrote: > >> (Deleting/moving directory >> trees from the likes of inside /usr/ports is a >> valid type of development operation. > > I see. That makes sense. > >> "git -C /usr/ports pull" is basically a sequence >> ( I made the command explicit about /usr/ports ): >> >> # git -C /usr/ports fetch >> # git -C /usr/ports merge > > The manpage mentions this. > >> The git fetch means that you have a full copy available >> locally... > > ... of the .git tree... The .git repository and its representation is distinct from your local directory tree that you normally use. The repository has history and such not visible in the local directory tree that you normally use. >> that you could check out into a directory tree... > > ... via 'git merge': checkout and merge are different operations. checkout is more of a replacement. (But clean -fd can also be relevant, depending on intent.) merge is for combining two variations into one. You had created a context with two variations, one in your local directory tree and one in what you had fetched. "git -C /usr/ports pull" does not do a checkout as its 2nd step. It does merge. Do not take anything I wrote as any objection to the use of other possible sequences that involve checkout. >> The git merge has to do with updating the local >> directory tree to deal with both already-changed >> local content and the fetched material. > > Seems I had a misunderstanding of 'merge' and 'checkout'. > >> It is not the goal of this to do the likes of a >> "git -C /usr/ports reset --hard HEAD". Nor is the goal to do the likes of a checkout. > Ah-ha! > >> A question here is if you maintain any deliberate >> changes of your own in your tree. (Are you acting >> like a developer at all?) > > I'm a mere mortal user... although I was once listed in the now > non-existent FreeBSD 'Contributors' web page... https://docs.freebsd.org/en/articles/contributors/ ? It lists: "Andy Farkas andyf@speednet.com.au" under "8. Additional FreeBSD Contributors". (You might want the speednet.com.au replaced?) I've never been listed as a contributor but I do have a few local changes (both system and ports). You might want to fetch without merge (no pull) and do the checkout or "reset --hard HEAD" sort of activity separately. It does not sound like you expect to ever want an actual merge. (It is possible to reach back before HEAD instead if something recent needs to be avoided.) >> # git -C /usr/ports reset --hard HEAD >> >> would destroy any deliberate changes to things >> in your /usr/ports tree. > > Bingo! This is what I'm after. FYI: Do not take it as the only way. >> git is biased to on-going development and so expects >> to deal with differences being involved in the local >> directory tree. It is extra work to be sure no >> differences occur or to remove the differences when >> unintended ones show up. It is not automatic. > > There ya go.. === Mark Millard marklmi at yahoo.com