From nobody Sat Jun 18 20:24:24 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 AEFE785AF11 for ; Sat, 18 Jun 2022 20:24:39 +0000 (UTC) (envelope-from andyf@andyit.com.au) Received: from alpine.spintel.net.au (alpine.spintel.net.au [203.23.236.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LQS7V3TQBz535B; Sat, 18 Jun 2022 20:24:37 +0000 (UTC) (envelope-from andyf@andyit.com.au) Received: from drunkfish.andyit.com.au (unknown [202.87.175.55]) by alpine.spintel.net.au (Postfix) with ESMTPS id 4889F4C2BBC; Sun, 19 Jun 2022 06:24:32 +1000 (AEST) Received: from [172.22.2.15] (tosh2.andyit.com.au [172.22.2.15]) by drunkfish.andyit.com.au (8.16.1/8.16.1) with ESMTPS id 25IKOUSt032157 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Sun, 19 Jun 2022 06:24:31 +1000 (AEST) (envelope-from andyf@andyit.com.au) Message-ID: Date: Sun, 19 Jun 2022 06:24:24 +1000 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 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: git pull not replicating? Content-Language: en-US To: freebsd-ports@freebsd.org, Mark Millard , grembo@freebsd.org References: <9038328B-04B5-47BB-9526-4CB8B94B9C53.ref@yahoo.com> <9038328B-04B5-47BB-9526-4CB8B94B9C53@yahoo.com> From: Andy Farkas In-Reply-To: <9038328B-04B5-47BB-9526-4CB8B94B9C53@yahoo.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4LQS7V3TQBz535B X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of andyf@andyit.com.au has no SPF policy when checking 203.23.236.77) smtp.mailfrom=andyf@andyit.com.au X-Spamd-Result: default: False [0.27 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[andyit.com.au]; AUTH_NA(1.00)[]; R_SPF_NA(0.00)[no SPF record]; NEURAL_SPAM_MEDIUM(0.06)[0.056]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.58)[-0.583]; MLMMJ_DEST(0.00)[freebsd-ports]; FREEMAIL_TO(0.00)[freebsd.org,yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:18390, ipnet:203.23.236.0/24, country:AU]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[203.23.236.77:from] X-ThisMailContainsUnwantedMimeParts: N 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... > that you could check out into a directory tree... ... via 'git merge': > 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". 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... > # 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. > 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.. Thanks again, -andyf