From owner-freebsd-git@freebsd.org Wed Dec 23 12:35:17 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 ADE6B4BE51C for ; Wed, 23 Dec 2020 12:35:17 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4D1CN41XS1z4nyp for ; Wed, 23 Dec 2020 12:35:16 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qt1-x831.google.com with SMTP id a6so11113035qtw.6 for ; Wed, 23 Dec 2020 04:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=c42gstSQVkG2Hnk9EZNMjmf8nNHvhI45nVyiQrVPI54=; b=KGYM79+8z3lxS7rU7XkIYVOtJpy/WsHSTpNR9KTKasyOLTGhmxG1U4go31G4t3GxWH S3EqcoR6rYMSYjKGI0PBPlL0ta43WrVbJpqaCpnxn+iqOcpsw8LAdPfezATlIBTxwTTU ifpJKT2FQMyJHgw46OIJGf83KifI7kXcXQVkbyeAir8YHGFKW3+TCqtSlnd2TypEgKwF ALVaziz34lAE13tP4cp/CBw8egXSfUVeM+jmH13VmEznIOy0O+2pVg4buOLUdGeBptvF naK20SwRRjKKAhDvxmr/x75qUZD03Hk1qLCGGSRWrqXL/uZGtqA76JPMhppAvXnJDTh3 Q3ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=c42gstSQVkG2Hnk9EZNMjmf8nNHvhI45nVyiQrVPI54=; b=oP5icwQdzy5wFFK1H3DFjD3d18MUP4IllT/yMaxWCgpLhOeBN638yuidgu0aMKLEbU +qIlkUxtxNgV56pTsx413CUAl1o364/lFI2jCWrbDcFY9IOoUj0BEsg6ldUc3Sru+g+M EaWv2pswgy9qX6SYkwlNKz9H4xxw52r2YJMQbcOhlqBpVlWLjAixVpyTbz7sPq5oZICz H95niCPUWQ90bQTjunij0td2x0zbL1GX+HoVENevOUW16j+fQa9Wl6+89khXjwsB/Zds 1Z4zwyEqA7y/O5kQB0K5uIsTulZSFXK8Z4P0hdCaO5FuDVYEfWOYP1iguHbrciMEPlJG d/1g== X-Gm-Message-State: AOAM530OOerrMEqAWHzQVoOtYwdyrqqcHPMUzlSuF/5iQK81boG2SNFq HSHJ8NYSi9Nu6TMPFgywbkN9HWLPrlrayQ== X-Google-Smtp-Source: ABdhPJxFRcOYr4n6fAeRNa5tnETOErsmWlNQs8jxgZeVw9w0JT6xJuWrJEmmbcVTX8Ni72J3LqZBEg== X-Received: by 2002:ac8:6947:: with SMTP id n7mr25738562qtr.83.1608726915066; Wed, 23 Dec 2020 04:35:15 -0800 (PST) Received: from mbp.home (200-12-5-188.rev.tribenet.com.br. [200.12.5.188]) by smtp.gmail.com with ESMTPSA id 184sm5884126qkg.92.2020.12.23.04.35.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Dec 2020 04:35:14 -0800 (PST) Sender: Renato Botelho To: freebsd-git@freebsd.org From: Renato Botelho Subject: Migrating a merge based project to new tree Message-ID: Date: Wed, 23 Dec 2020 09:35:11 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D1CN41XS1z4nyp X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=KGYM79+8; dmarc=none; spf=pass (mx1.freebsd.org: domain of gargabsd@gmail.com designates 2607:f8b0:4864:20::831 as permitted sender) smtp.mailfrom=gargabsd@gmail.com X-Spamd-Result: default: False [-3.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; TAGGED_FROM(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::831:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[FreeBSD.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::831:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831:from]; 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 12:35:17 -0000 I'm working to migrate a downstream stable/12 based tree to the new git repository following instructions from [1]. I did a final merge from legacy repository and made sure top commits on both branches point to the same tree: # git show -s --format=%T f4d0bc6aa6b9 98db7229803a5c93e3132bc661201f204487eee9 # git show -s --format=%T f262e04c92d7 98db7229803a5c93e3132bc661201f204487eee9 When I try to merge new one git refuses to merge due to unrelated histories. Should I use --allow-unrelated-histories parameter? [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree -- Renato Botelho