From owner-freebsd-git@freebsd.org Wed May 27 13:50:01 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 59E0A3330AE for ; Wed, 27 May 2020 13:50:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) (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 49XBzD3GDFz4Ppd; Wed, 27 May 2020 13:50:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f193.google.com with SMTP id d1so1528044ila.8; Wed, 27 May 2020 06:50:00 -0700 (PDT) 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:cc; bh=ho0Zw4LHOgVyyBKVGWIfVGS+eIF7lkwPECcsBH/z5uw=; b=P4u/dghLzHvVH2Xlntht4GEcFPwTNq0vR5h/VQQgTnVi5g+IKHBV46xpevMG/WE8HK 8jCZIBYrymMHl4DiAUmGxa4/cNqLg6eyLbuCxV0UyAdHUj6nWTo2evujbsiRHvVEMgHz 7kPMsOPqXWZdUSr2BMGQWm4rOMQDEzx9jwUIqDDQInC/2rq/eWJpR1cOf6PWAHW2rBL4 3bnCxrp8eOYRXI0q5gsy5CuwL8LEFjMmkIdXTogb3LnAbfFZyo0ShRc3ZnkdIdqXbP4A WJ8hUmFUh74XHo36exsehQ6nWBRQD0BpLGFcZWyBfWLKK3JhLoTZi84e0n3OmhfFH843 19EQ== X-Gm-Message-State: AOAM530BJ9WPKEI/0PgPl90eVxobThBlhmnsGwU7dQl4a50OuUuZ4arC 8vfz6EYxV6SmbSVyYQw5Vkv6IHLThUFMnRnMgXg+7CzGh0s= X-Google-Smtp-Source: ABdhPJyvafqzUIo+cIvXE6dJ0WNhZLmqHKsVMUJpJgGEnoe69aSc9CMOGV1Gv3Kvs9HxgaG4kG9R3cBfTXjK0r6eHQ8= X-Received: by 2002:a92:8d03:: with SMTP id s3mr5784267ild.256.1590587398161; Wed, 27 May 2020 06:49:58 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 27 May 2020 09:49:45 -0400 Message-ID: Subject: Re: Another svn-git oddity To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49XBzD3GDFz4Ppd X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.193 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.83 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.011]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-0.997]; NEURAL_SPAM_SHORT(0.18)[0.180]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.193:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.193:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 27 May 2020 13:50:01 -0000 On Tue, 26 May 2020 at 14:32, Ed Maste wrote: > > On Tue, 26 May 2020 at 14:20, Ed Maste wrote: > > > > I still see these in the latest iteration, commits > > e3850c874e5ffc0edae1887b21cb27b642de9161 > > 08b39b4bc02e511188ff37159e33fd095c6b28ba > > 227b908653e891cdd4a26c40eeb078e4b138d16f > > > > I'm looking at the converter now... > > I'm running the converter locally with a rule for 300828 added now. I added to freebsd-base.rules: match /usr/nwhitehorn/kboot/ min revision 276329 max revision 276329 end match match /projects/bhyve_graphics min revision 300828 max revision 300828 end match to skip entirely these commits that established new subtree working dirs. This addresses some of the "git subtree split" problem. The next commit affecting subtree split is caused by r268229: Author: marcel Date: Thu Jul 3 18:24:28 2014 +0000 Sync with head. Notes: svn path=/user/marcel/mkimg/; revision=268229 This is now recorded as a merge from head @ 268227 into Marcel's mkimg branch. In the existing (GitHub mirror) conversion it is not a merge (presumably just because we're not parsing mergeinfo at all there).