From nobody Wed Mar 29 03:40:58 2023 X-Original-To: freebsd-hackers@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 4PmXQR0R9zz41slY for ; Wed, 29 Mar 2023 03:41:03 +0000 (UTC) (envelope-from void@f-m.fm) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 4PmXQP5pgCz45H5 for ; Wed, 29 Mar 2023 03:41:01 +0000 (UTC) (envelope-from void@f-m.fm) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=f-m.fm header.s=fm2 header.b=n+fbcX1s; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=VYYmRM0w; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 66.111.4.25 as permitted sender) smtp.mailfrom=void@f-m.fm; dmarc=pass (policy=none) header.from=f-m.fm Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 03AE05C012C for ; Tue, 28 Mar 2023 23:41:01 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 28 Mar 2023 23:41:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-m.fm; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1680061260; x=1680147660; bh=HF Ae85Lo7GzkhIK7lZ6zB7dwjoMZYxFcMGAkyQUsENU=; b=n+fbcX1sk6pWscOhrE +BGxBcaw/cSVu1y+AyajknnRDjNr31bRi4wrQG5rMOqAqAq0lpdOjYUW7avX25d5 FH7LxoVGLJHl3Bh2aXW4QFeusrL58lxKlSWnL4BVRWpNf6UKG3Hlb744MepNjeA+ mL0QLC1VoHKnHIiDkxCXgN1mpTzBJ6SGulI5OvRPujmXIWu+6mqli+yiyMV+tBY2 ujWH1+ysfw/FioBJ3W84zIxK9EZAY7B33um215O0TRP/Bo95HGzNw7Q6jfbyZMS6 7o7jydYn5suZWFchPNBOlA/BlJvDJ7ev13WFZes6+rJx/rIIy7RpWDwtHqcwQXpb LepQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1680061260; x=1680147660; bh=HFAe85Lo7Gzkh IK7lZ6zB7dwjoMZYxFcMGAkyQUsENU=; b=VYYmRM0wrgNDMs6KwUn20NtrT88TP 8b2wgR9o6ryazisqHdLAQKN6QJlOb8uBRLOWdd/6U/33a5fS6zhZxgsf0v9J3mO6 64Opt5xg1LYVNxQfxH4wSgdgTuPHW1F/+3a/InE8TjCWKSf5pMGTCo1CNxSIZk1t GPO/HnOGvaaXdkfppr1VzMMlFLp8q8oZI9XfwYNXukulhyYKwFLmlv9ETfmemVUq 2Y8NKgC11gQAXkd/CBWA+O8b5wop2HvdQmbx2EKI++bThdwvefSaR2pSTsxfSGPU 0sU7wWoj8qIDCrPC8cBLdRGw1aqrmVMEdT9FUWHiMliccRArONVf1D49A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehhedgjeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesthdtre dttddtvdenucfhrhhomhepvhhoihguuceovhhoihgusehfqdhmrdhfmheqnecuggftrfgr thhtvghrnhepkeeluddvlefhieelfefggffhffektdehleelgfdugfdvgeekjeejuddthe ehgfeunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep vhhoihgusehfqdhmrdhfmh X-ME-Proxy: Feedback-ID: i2541463c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 28 Mar 2023 23:41:00 -0400 (EDT) Date: Wed, 29 Mar 2023 04:40:58 +0100 From: void To: freebsd-hackers@freebsd.org Subject: Re: what's the Correct git update method keeping local changes Message-ID: Mail-Followup-To: freebsd-hackers@freebsd.org References: <57699630.208778.1680058392828@ichabod.co-bxl> List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <57699630.208778.1680058392828@ichabod.co-bxl> X-Spamd-Result: default: False [-3.77 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; MID_RHS_NOT_FQDN(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[f-m.fm,none]; R_DKIM_ALLOW(-0.20)[f-m.fm:s=fm2,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.25]; RWL_MAILSPIKE_GOOD(-0.10)[66.111.4.25:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.25:from]; NEURAL_HAM_SHORT(-0.07)[-0.073]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[f-m.fm]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; DKIM_TRACE(0.00)[f-m.fm:+,messagingengine.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[f-m.fm]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4PmXQP5pgCz45H5 X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On Wed, Mar 29, 2023 at 04:53:12AM +0200, Sysadmin Lists wrote: > >I use the following interactive script to update and maintain local ports mods. >It updates the poudriere jail, switches branches when available, and merges >changes to my custom branch. Thank you for posting that script, it looks interesting! --