From owner-freebsd-git@freebsd.org Wed Dec 23 14:15:20 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 8B8A54C0345 for ; Wed, 23 Dec 2020 14:15:20 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 4D1FbW6J5Cz4vnV for ; Wed, 23 Dec 2020 14:15:19 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x82f.google.com with SMTP id u21so11278857qtw.11 for ; Wed, 23 Dec 2020 06:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ATvDOdIA4HLOEzh6qqBwh7FsZvKF+5vsS9zlMjKqTBQ=; b=dfviS9JlUsPqwqU8n5KH3TPFS3amUjvwcmxXaBmdfE7638wqr6eKMKGD7bsVFL32WE WPpDa+39B0gjrry50nc+MTZQqXC7CO7kEgaKolzCbw0rEHyj1cKDAE2eubHL7iKDdARZ xpUzlCxQ0JE30l0tpahl5eUoa7TCEuzmBeuMT4iXgb3iFQPPep6eC8Op3HycjEmX8d1L 1m7euB0Tnzi0UkDzZgicmrcjB+FGINHVvBmkM7KUi1bFm1nFBkv08GoRgWd+iOTOOthU EkfIlTl647mJsfKQUMyOCfNjYjy47SDtcnRdQgp3Q+rQTZCB8wy6n4ERAmdljFfbdt8e 0G6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ATvDOdIA4HLOEzh6qqBwh7FsZvKF+5vsS9zlMjKqTBQ=; b=fXDMhOqWZxs2UY8q5ajkOUIOqK2Qs9opFR9usLhwf6UCzUv4/m7MkudS9e98LvChpt xPKb911kSjcGa0O94eWOJNfhHvvA4ADxWMV4lT3kS87gAsHKLMxXr9ZIqF6sPSNXCHks SaQMStkcfbIiljPNx6WhjYUKovbaBOmk4inPjm/UlLlIpcuDaw9GX1KVnoVCZi/3fhj9 Va2qm+y5gRcFBxwaGfpn9fd23zhHZRITJY0wNrKri9q3UKHAKzX3JqBmjsek1CLyLjxC Wvc2sYBcHT/aB92YfqXaMC9Fq8DqDPeJjMC9UAACmj/P9HyWk8hKk/joZ+wy0JdM6xeR XoGQ== X-Gm-Message-State: AOAM5337LWTen9lPeHhTC8srJzCepQWq2T6vTfQ3plnOziqpLS24IjST F9QfL4h1rsMdt1MNUWGWp8ge7v2Xv3IwjhQJ X-Google-Smtp-Source: ABdhPJzUU1p9vzT+MXz1QtE0TUh/XV3xctWS5i7Ku+1F3Q4GX+b5vtmM0am0Wg2uXIMc1oEZuJPC9A== X-Received: by 2002:aed:2070:: with SMTP id 103mr18834672qta.287.1608732918598; Wed, 23 Dec 2020 06:15:18 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id v137sm15573447qka.110.2020.12.23.06.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 06:15:17 -0800 (PST) Date: Wed, 23 Dec 2020 09:15:17 -0500 From: Shawn Webb To: Renato Botelho Cc: freebsd-git@freebsd.org Subject: Re: Migrating a merge based project to new tree Message-ID: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fonvmsktny6wvm6c" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D1FbW6J5Cz4vnV X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=dfviS9Jl; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::82f as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-5.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::82f:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RECEIVED_SPAMHAUS_PBL(0.00)[100.16.222.53:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::82f:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82f:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] 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: Wed, 23 Dec 2020 14:15:20 -0000 --fonvmsktny6wvm6c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 23, 2020 at 09:35:11AM -0300, Renato Botelho wrote: > I'm working to migrate a downstream stable/12 based tree to the new git > repository following instructions from [1]. >=20 > I did a final merge from legacy repository and made sure top commits on b= oth > branches point to the same tree: >=20 > # git show -s --format=3D%T f4d0bc6aa6b9 > 98db7229803a5c93e3132bc661201f204487eee9 > # git show -s --format=3D%T f262e04c92d7 > 98db7229803a5c93e3132bc661201f204487eee9 >=20 > When I try to merge new one git refuses to merge due to unrelated histori= es. > Should I use --allow-unrelated-histories parameter? >=20 > [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-projec= t-from-legacy-git-tree HardenedBSD's in the same boat. We're toying around with different methods of fixing our repo right now. When I used --allow-unrelated-histories, git noted merge conflicts on every single file HardenedBSD has touched over the last 7.5 years. I tacked on "-X ours" and that made git happy. However, I'm unsure git always did the right thing. I'm working to verify that this week along with trying the other documented methods. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --fonvmsktny6wvm6c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl/jUPIACgkQ/y5nonf4 4fp3Iw//TZAwsaUMI2B5rvmTPh7rjfwwp4hnw3xHrk1tMDNcqPlh4h1O5MFlP1uq CyGWX/JkLha0uWTLSPV40v8HCX3hddFY7CL/jfSZUY2IKSB2qoiwZl68J83X48pu TmBP1DgK83w5xioyPby/TQF6KyXoO9oZogjhTAcLA+pxmFKqh+ZkhbpENhnAfIcs Khyv5XId3veLPwJ0hM0NEh4JqKlkI00gn2jpUNT/QV7dzYSrSPZmygsluT9Q+AQy ASN6jizBt4rV5J96WNAxZH4FobGH6lawpCq/aY6Ede6X6+34AZ8uLCQwx4+kI99L xywrRNGuM8hem9EAzpvaIuA7sldHMjnscMt2+4c3HfP+QPl9LnMv6NX0rGh7f2Qp UBCHiH70f/fu40t+0nMYgXb5n/Q1mmKbuv/KJafqcEqCGZJWOkLdX0xNkNgnzr+R v0TORVAWrJ7leVwcjGe1qLwlBnWErdA9kKAWowujsZbDkOaWa+gnab8SBnAflKmd awwaQ+Q29yD2GXBt32Sihm7/YOKeqAW4Yr+D7S7MqGk92yeoN3H0Y0Pwq9vE8nNk uHhN4OAhiAbE7hclxpYGXgGFJV5FZnVp39W0aSppsfTez2nn+bcQa8Sv2eDOqMc/ IpcIouYQAm/u/ZWMEKlyYUm1KH55c0C0wVuloDhtsFS/+s9Gm8w= =uXE5 -----END PGP SIGNATURE----- --fonvmsktny6wvm6c--