From owner-freebsd-git@freebsd.org Sat Nov 28 14:07:19 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 618734A1AED for ; Sat, 28 Nov 2020 14:07:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cjtbq2JXWz3sJj for ; Sat, 28 Nov 2020 14:07:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 4D69D4A1F54; Sat, 28 Nov 2020 14:07:19 +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 4D2454A2139 for ; Sat, 28 Nov 2020 14:07:19 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjtbq0b9Tz3s7q; Sat, 28 Nov 2020 14:07:15 +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 0ASE7EXG021398 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 28 Nov 2020 15:07:14 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 28 Nov 2020 15:07:14 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Rene Ladan Cc: Dimitry Andric , git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> <20201128134045.GA35756@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20201128134045.GA35756@freefall.freebsd.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cjtbq0b9Tz3s7q X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 28 Nov 2020 14:07:19 -0000 On Sat, 2020-11-28 at 13:40:45 +0000, Rene Ladan wrote: >On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: >> On 28 Nov 2020, at 12:38, Rene Ladan wrote: >> > >> > I just noticed that after doing a 'git pull' that the ports repository >> > at cgit-beta seems to have diverged: >> > >> > rene@e17:/usr/freebsd/cgit-beta/ports % git status >> > On branch main >> > Your branch and 'origin/main' have diverged, >> > and have 546213 and 528036 different commits each, respectively. >> > (use "git pull" to merge the remote branch into yours) >> > >> > It took 5.85 seconds to compute the branch ahead/behind values. >> > You can use '--no-ahead-behind' to avoid this. >> > >> > nothing to commit, working tree clean >> > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch >> > rene@e17:/usr/freebsd/cgit-beta/ports % git pull >> > fatal: refusing to merge unrelated histories >> > rene@e17:/usr/freebsd/cgit-beta/ports % >> > >> > and what happened to those 18000 commits? >> >> I think you just missed Ulrich's heads-up mail :-) >> >> https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html >> >Yes, I was a bit too fast noticing myself ;) Yeah, sorry about that. I typically test new rulesets on my own machine and compare the results first, somehow I only did this for src when I did the history for the `access` file and for ports it lives not under svnadmin but under head/CVSROOT and I somehow didn't test that, wanting to get the change out and over with. With the right git incantation you should be able to rebase your work on the new upstream master just fine. Sorry for the inconvenience, Uli