From owner-freebsd-ports@freebsd.org Tue Apr 6 22:50:59 2021 Return-Path: Delivered-To: freebsd-ports@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 B72D25C093E for ; Tue, 6 Apr 2021 22:50:59 +0000 (UTC) (envelope-from ericturgeon.bsd@gmail.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFN6V5tLlz542x; Tue, 6 Apr 2021 22:50:58 +0000 (UTC) (envelope-from ericturgeon.bsd@gmail.com) Received: by mail-qk1-x735.google.com with SMTP id y5so16786464qkl.9; Tue, 06 Apr 2021 15:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=rXT6/XHEwhjTJu8bvYvCSjeWYeyZXVqbDec3grmyQZg=; b=n/jSu2cz4sK6HvI81NrlWU0u3Vir+DSsV/tRC5jVmdacqS4TYahhideG37KEtLTyRe 3+KG3JfYoJSeDuXjIMTS/ks7bXqLUOMLIKEZHLz+g3mMmapBZOrFrDUXNsyVfcsfz9xN hP3p5dWD1Uhj85kd6COV0WrkGcY1LN0Z866b277aWvHISVKUQ+oKWVXwCfT3ykYa+snx hBwt9CoWSJ4lIFAJ8ULeYuhwJbnahMz2GIM2xjeI0J90V2r9ToGAMxs+n/+eAPEOFoJg y+4Q5HWLZ0wMkF3WuDAqJz5LPj4Qf6fpeR7aBhBZduYXIxaQ002E5ubfDIv7JZBi0lOl Eb8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=rXT6/XHEwhjTJu8bvYvCSjeWYeyZXVqbDec3grmyQZg=; b=RQ4WJnSCy66OOIMcYhMPaRH3nCSMIqcC/5VFdJbpla6HaWCwnt9mussih9Ak7DdpxR DGuhfQgWmiqQGOTGra6HVBv7Qo4YCqwFNJZ99aaCiqhCgCIVP23W3HWs5cWOH3xmQDu4 YGKLeAp6SOXQxB3F0GXW9m49D2N/WgzowxudIuiYlNgVhJBG+wrVDGJ6bRvaR0cF3cZb sQcJni/TeURKNkmXxzpPgANV9khr3gUSl2P9+uGzqe6uIUs16w+fUrbfM4xB2rW4mgfA 7GX8L1Y9h+2mrq2APFDwGFryhrk/1D3Dz7cBIfm3sO7jMyJL2S66iuwo3R646SFR2fSw VrWw== X-Gm-Message-State: AOAM531zO0cwbXfrS+AYrMhJhrRkUV8UcWVZpUDg4Z3FIyrF+Evh9bfW bQDm5+QlmVHjElYyVsfIJOne5wS/75i3Tk2OckveWg0wWmc= X-Google-Smtp-Source: ABdhPJwwfWCdLhispbhLKpZLyvipYgjLw9Fluv6/LVvvVfasPxm8ZLezyFHl9Vmg+dW3jshrUqCxJiDqjsHqH19yPGA= X-Received: by 2002:a05:620a:14ac:: with SMTP id x12mr206958qkj.409.1617749457013; Tue, 06 Apr 2021 15:50:57 -0700 (PDT) MIME-Version: 1.0 References: <20210405214557.GJ71823@spindle.one-eyed-alien.net> In-Reply-To: From: Eric Turgeon Date: Tue, 6 Apr 2021 19:50:45 -0300 Message-ID: Subject: Re: Any plan to fix ports git main history compatibility with old GitHub master? To: Brooks Davis , Eric Turgeon , FreeBSD X-Rspamd-Queue-Id: 4FFN6V5tLlz542x X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=n/jSu2cz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ericturgeonbsd@gmail.com designates 2607:f8b0:4864:20::735 as permitted sender) smtp.mailfrom=ericturgeonbsd@gmail.com X-Spamd-Result: default: False [-0.76 / 15.00]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.76)[-0.756]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::735:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MIME_TRACE(0.00)[0:+,1:+,2:~]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::735:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::735:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-ports] X-Mailman-Approved-At: Wed, 07 Apr 2021 05:37:54 +0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 22:50:59 -0000 Thanks! I was able to fix that this morning and I just merged back from main and everything is working fine. *Eric Turgeon* On Tue, Apr 6, 2021 at 2:08 PM Ulrich Sp=C3=B6rlein wrote= : > On Mon, 2021-04-05 at 21:45:57 +0000, Brooks Davis wrote: > >On Mon, Apr 05, 2021 at 05:33:08PM -0300, Eric Turgeon wrote: > >> Today when trying to sync the GhostBSD ports tree with the FreeBSD por= ts > >> tree, I found out the main branch history is not compatible with the o= ld > >> GitHub master. > >> > >> Any plan to migrate to main with hold git history as we had with > >> freebsd-src? > > > >The main branch will contain a commit which is identical to the last > >commit of the old master branch (except for the hash). If the GhostBSD > >repo is merged up to that point, you can then merge the matching commit > >from main and proceed with using main as the source for future merges. > > > >If you have outstanding WIPs the process of updating them to the new > history > >should be about the same as the one for source: > > > https://github.com/freebsd/freebsd-doc/blob/main/documentation/content/en= /articles/committers-guide/_index.adoc#562-migrating-from-github-fork > > This special commit was only provided for the `src` repo and will not be > provided for the ports repo. It is fairly trivial to do this yourself > and there's documentation around this here: > > https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-fr= om-legacy-git-tree > > > It should roughly go like this: > 1. add both remotes and fetch from them > 2. merge into old master as usual (this is > e010feae47ac7fda1354fb3b12290a5ee42ef590) > 3. merge into main at the same instant in time, using your own tree: > git merge -s ours --allow-unrelated-histories > 3cc0c0d66a065554459bd2f9b4f80cc07426464a > 4. now merge into the new origin/main from now on and forevermore > > hth, please let me know if you need further help! > Uli >