From owner-freebsd-git@freebsd.org Sat Dec 26 12:38:13 2020 Return-Path: Delivered-To: freebsd-git@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 30AD54B8945 for ; Sat, 26 Dec 2020 12:38:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D33J50whyz3kVV for ; Sat, 26 Dec 2020 12:38:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1DFEA4B8944; Sat, 26 Dec 2020 12:38:13 +0000 (UTC) Delivered-To: git@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 1DC414B88A7 for ; Sat, 26 Dec 2020 12:38:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D33J44vN3z3kXH for ; Sat, 26 Dec 2020 12:38:12 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BQCcAWO014022 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sat, 26 Dec 2020 13:38:10 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 13:38:10 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: Please review: suggested final merge commit on the legacy repo Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D33J44vN3z3kXH X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 12:38:13 -0000 Hi folks, please have a look at the suggested merge commit, that merges master and main, which should allow folks that have significant work on the old hashes to: git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git && git fetch freebsd-legacy git merge freebsd-legacy/master (this should work mostly conflict free git merge 3cc0c0d66a065554459bd2f9b4f80cc07426464a (this is the main at the state of what legacy master is) and then they have a shared ancestry (though twice the commits). For rebase based workflows, rebasing onto legacy master should similarly work mostly conflict free, then they should be able to rebase onto 3cc0c0d66a065554459bd2f9b4f80cc07426464a sans any conflicts and finally rebase onto freebsd/main with the usual set of newly introduced conflicts. The wiki still needs updates to the final hashes now, something I'll do at some point. Ideally, we can push this final commit to master before New Years and then we can start mirroring the new main/stable/releng into GH. master will be garbage collected at some future date. I do not think doc and ports should receive similar treatments unless people can show me evidence that this is truly needed (and people can't figure this out from the provided instructions already). Cheers Uli