From nobody Tue Mar 28 14:25:39 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 4PmBmn4B2Cz420sR for ; Tue, 28 Mar 2023 14:25:45 +0000 (UTC) (envelope-from void@f-m.fm) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (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 4PmBmm49q8z4d2W for ; Tue, 28 Mar 2023 14:25:44 +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=t3MBHtJ4; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=n2iirFAX; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 64.147.123.24 as permitted sender) smtp.mailfrom=void@f-m.fm; dmarc=pass (policy=none) header.from=f-m.fm Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 86CF33200900 for ; Tue, 28 Mar 2023 10:25:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 28 Mar 2023 10:25:42 -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=1680013542; x=1680099942; bh=Qg bq7G6HieBL4bO48uDmLob3792QoeirYQ9bXeEQz8Y=; b=t3MBHtJ4ihadX7kO+h ULLQAytweyKhzDnO7XBi3Gxv20Z+SfO9oqOs4BRTKaA4aiD/zph7Ifj4spUAwm20 7l6qso4ZhDYoOjvC3ZlFttXS2UZcESJCG3h+NGhO/IHSerjP3RDp8QvQlu5vgx8K 9x50r3UdCIwLEdNlwzkjRsBrCZGx9h4hfZz0ocekjQP46dPULJ+CV2S3ZdSDAyVW KZUO+sxO9+5VDgV2hVlouEbu4KzoyOjJRtyuDjM+tyiiJojc9Js2JBIUaEKJUG3N Ovqp3RIPJjIoBycRi2j/SSqhYfcYqwR5kdI5yjLuCpseCEsa3EcF9EJHy5Ew7n+9 WVTw== 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=1680013542; x=1680099942; bh=Qgbq7G6HieBL4 bO48uDmLob3792QoeirYQ9bXeEQz8Y=; b=n2iirFAXmSpKzpAoD1Yyq0RTxKdEn YbMs2mEZcVrhvP/08hES7K6r6P7Tya0lZpqumsFhqG+DSKR4OOVZlDS8blO5l3yx M1DA8D2annY8rLSGNVjwFlcmqAPI6Rkvklla6CP5Xg/J4MrwRFo72m6Bg7VwxjJ9 vBtHtKs1D33iORcl6uLWF5o0/fRvLlm8G7MllvNBtjAWsqhFJtpJuN1b65khjEmW 5YcGe0Esbv/YzZ8c3YjnvL9mzfbq4s7EAG9ueWthWjSWFUHIwElShk4o4WvjIdKo xMrBMyzPLxPNdfCyIKMV//tsPixwLbATPs8C5YBwfKNKMWu6FCnttNPhQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgedgjeehucetufdoteggodetrfdotf 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 10:25:41 -0400 (EDT) Date: Tue, 28 Mar 2023 15:25:39 +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: <708822f5-2a2f-35f7-8f79-bf48ff644a22@FreeBSD.org> 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: <708822f5-2a2f-35f7-8f79-bf48ff644a22@FreeBSD.org> X-Spamd-Result: default: False [-4.35 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.75)[-0.755]; 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:64.147.123.24]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.24:from]; FREEMAIL_ENVFROM(0.00)[f-m.fm]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; FREEMAIL_FROM(0.00)[f-m.fm]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[f-m.fm:+,messagingengine.com:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[64.147.123.24:from]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4PmBmm49q8z4d2W X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N On Tue, Mar 28, 2023 at 09:59:45AM +0200, Matthias Andree wrote: >Am 28.03.23 um 05:19 schrieb void: > >So - there's some discrepancy in your tools there, you are using git to >keep local patches, and poudriere to update. This seems odd. Is >poudriere using git to update your ports tree? Portsnap? Something >else? We don't know. This is where I was going wrong. poudriere -u was using git+https for updates and was complaining after patches were applied. I've not looked/found what git subcommand 'poudriere ports -u' maps to, yet. Instead of using using 'poudriere ports -u' I'm now using 'git -C $portspath pull' and it's working as expected with the 'default' portstree of poudriere. Thanks everyone --