From owner-freebsd-questions@freebsd.org Thu Mar 4 20:52:24 2021 Return-Path: Delivered-To: freebsd-questions@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8451E559BCA; Thu, 4 Mar 2021 20:52:24 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [IPv6:2001:41d0:302:1100::1499]) (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 4Ds32t6gR9z4vGJ; Thu, 4 Mar 2021 20:52:22 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:9901:d058:4244:d852:ecfa] (p200300Fb4F009901D0584244D852eCfa.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:9901:d058:4244:d852:ecfa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4Ds32k6kN3zykp; Thu, 4 Mar 2021 21:52:14 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: ports and git, first steps Date: Thu, 4 Mar 2021 21:52:12 +0100 References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org In-Reply-To: Message-Id: <3EF74FAB-37C0-4289-BED5-5EBDB4DFD2DF@ellael.org> X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4Ds32t6gR9z4vGJ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:302:1100::1499) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [0.22 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:302:1100::1499:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[ellael.org]; SPAMHAUS_ZRD(0.00)[2001:41d0:302:1100::1499:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.82)[0.823]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; 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:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 20:52:24 -0000 Ulrich Sp=C3=B6rlein wrote: >=20 > On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote: >> Ulrich Sp=C3=B6rlein wrote: >>> Besides, `git pull --rebase` is pretty much the only sane choice for = poudriere anyway. >>=20 >> Good to know. Now, all I need to modify is the git repository's = server name after the final migration. >=20 > Yes and no. It defaults to using the Github mirror and we will = force-push the new content there, but `git pull --rebase` will totally = barf on that, so you'll need to manually: >=20 > - git fetch --prune > - git checkout -B main origin/main > - git branch -D master >=20 > or something like that. (you need to rebase your stuff from old-master = to new-main as well). I mentioned in the beginning that I am a newbie when it comes to git. No = I know, that I didn't downplay ;-) Most probably I will start from scratch instead, because I do not have = local commits anymore. Sidenote: the most difficult issue with git versus svn are their = completely different concepts, and, as a consequence, different concepts = to achieve related workflows. It took me some time to understand, and I = do have the feeling that I do only understand about 1% of git's = functionality, now. > We could actually bake this logic into poudriere and have it do its = thing during a ports update, but it'll be rather fragile I suppose. I don't think that there are many users that use the beta git repository = in combination of poudriere, currently. But I might be mistaken. Thanks again and with kind regards, Michael