From owner-freebsd-git@freebsd.org Sat Nov 28 14:53:44 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 A8EF34A2E9C for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@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 4CjvdN45zMz3tTV for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8CCEB4A2E9B; Sat, 28 Nov 2020 14:53:44 +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 8C95F4A2D1D for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjvdN3Xbkz3tTT; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606575224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAr26kX0B3KLu0R6kXMeJaYyheJbr6xLtEDV0xX3of8=; b=XZwZvwZGe5jTZ3t9U0nc/RtLW7axyIreBL5095Xq0HsWEbC22GHRrq4PP1727MwIIVjmDp uvrY4wlv9yx/yoIVu6V4gVw35xzu7tgiDdlGqTIpDJsXmW6E+EL2W3seqYdiIz1bhfh7lx HW+hC7Azc7hZ5PzwIRPEykygsCU/8DNPAr9pT7PFIqYHA27nou2wfZoC1ycQvM0rnI/BMR vXIGkDtaA1K/t24IcYTZ3/iOxYnXNV9PI/praPNxDGs8rKV/6NAMKKpOiDlUQnO7CzWGB/ ERWB338wj+fHb3gvf1HTRZjI+uXnn2xfYGRSpGGd6l2Ycb4JP52HVpdMVHbPeQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 6767819F3E; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) Date: Sat, 28 Nov 2020 14:53:44 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: Dimitry Andric , git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128145344.GA2642@freefall.freebsd.org> 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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606575224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAr26kX0B3KLu0R6kXMeJaYyheJbr6xLtEDV0xX3of8=; b=SP7NnVGh6xMQZT6LabczJ8FjPKefknJ5LX6wRYRYn41Oex/5L9EYkNc7c+ZpRGuRjaHUzD 5Pb7x+VX9Ef8nrYl9X/j7zEiUkqSKNAnqLiLMnesMi4U4b2UYjsgKGr4qAS374Ir01QOOb phf/TVeBZ1ajI0FaTMugm/Q+knpJB+Lctyx2mUQ7dv/fVwOnJQ3DK+xtF3ce3Sw/usF93B AAtFIfMnhycubHjzYvw6fxz9QWL3WovZpJEgNE7lxwfaexSYQW9hKvc4JTNDoib+ki6lH8 65Ik1TSIS3z0Hwxw+38Jb2FDc3FwYTzjsH6b5FhUs1mEzQfgAOVUED7n+ZmgLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606575224; a=rsa-sha256; cv=none; b=E2YMLxDpo+Ns+8DakgQmHHPN2lcV0h+1SDDTea1Zp7NpMl/SvBpmFMQsCTT/SuTv+fDmJY p7Qe2O8vNCerHfmxhw79+gPb8RbUSfutXwCy/QQ+SdfxBkQw5UHRHR2xTHLxIo7pudCry2 xK/HeGOYX4oC4G1XDsZzjeXGpITwaTA9QksjQGVAa4fSvq7XNMjZQjFelhdASxXt+WLKWL vq74vlMdAvhXbxhYgVAWvaHSCpnyyJE94YnDBi2wgfi7+K2FkxsuckH6umgCi/tu2KmcFw R8ILMm2xxUtk3VWil/YpUmPa5tzG2LKTRZnSUZs7JR8uwzqODv14i5bzhrMZcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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:53:44 -0000 On Sat, Nov 28, 2020 at 03:07:14PM +0100, Ulrich Spörlein wrote: > 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. > Uhm, `access` and `mentors` do live under svnadmin for ports, see https://svnweb.freebsd.org/ports/svnadmin/conf/ There is no head/CVSROOT in ports. René