From nobody Tue Oct 12 15:31:48 2021 X-Original-To: freebsd-current@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 1F1E917F04A6 for ; Tue, 12 Oct 2021 15:32:00 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (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 4HTKQl2kk5z3nf1 for ; Tue, 12 Oct 2021 15:31:59 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id EB0FC10A32E5 for ; Tue, 12 Oct 2021 17:31:50 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 489E11056B1E for ; Tue, 12 Oct 2021 17:31:49 +0200 (CEST) Received: from hermann.fritz.box (dynamic-2a01-0c22-a4ce-1b00-742c-bcef-4a23-f23c.c22.pool.telefonica.de [IPv6:2a01:c22:a4ce:1b00:742c:bcef:4a23:f23c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 1A40F10B4FAD for ; Tue, 12 Oct 2021 17:31:49 +0200 (CEST) Date: Tue, 12 Oct 2021 17:31:48 +0200 From: FreeBSD User To: FreeBSD CURRENT Subject: git: "overlay" of own remote-branch on official freebsd-ports repo Message-ID: <20211012173148.1d2f138c@hermann.fritz.box> List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: dea267 X-Rspamd-UID: 93362c X-Rspamd-Queue-Id: 4HTKQl2kk5z3nf1 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd@walstatt-de.de has no SPF policy when checking 2001:1640:5::8:31) smtp.mailfrom=freebsd@walstatt-de.de X-Spamd-Result: default: False [0.02 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.87)[-0.870]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[walstatt-de.de]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_SPAM_LONG(0.99)[0.990]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N I do not know whether I'm right in this list, but since the subject is mutual so common in development and GIT, I have the strong feeling I'm right here. Im quite new to git, so apologizes for any inconvenience reading my question. Using poudriere on 14-CURRENT to create a selection of packages also includes updating the ports tree on a regular basis. I maintain some "special" ports not official part of the FreeBSD ports tree and some other ports are part of those I'm supposed to maintain. I keep personally track of the changes in a git repo of my own. Now I'd like to "overlay" the official portas repo by that of mine to include changes. With SVN, there was no problem to have local changes not overwritten by regular updates of the ports tree as long as the specific port in question wasn't updated by the official site. In git, this behaviour seems to have changed, any changes I made so far are gone after poudriere is adviced to update the tree. I'd like to ask how FreeBSD developers and maintainers do the trick. If there is an official cookbook fpr maintainers (I haven't found it yet ...), please be so kind and refer to it. Any advice is welcome. Kind regards and thanks in advance, O. Hartmann