From owner-freebsd-git@freebsd.org Tue Jun 16 18:42:12 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 7FC1E346EF4 for ; Tue, 16 Jun 2020 18:42:12 +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 49mcW74Rlwz4WdH for ; Tue, 16 Jun 2020 18:42:11 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f193.google.com with SMTP id j19so15810445ilk.9 for ; Tue, 16 Jun 2020 11:42:11 -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:from:date:message-id:subject:to; bh=EVR0poI8D1ZpYSaY9VqHvO7KfF/wZjAThvnbujhCoBM=; b=aZAumHU/HAWFqGf0MW9UMk7QxBSnuO4fYzRJg4bfXd7SWVuXPFnzkHsY0nIOFUSPTA 2vgBsco/d+LpkltJa2fgpXW5vo/gci3xIFuUILx7xpS15nrce3n8aeY4ISLYAyxnh/B1 l3Syd63I3Tn82AwesrZIRSkdRNkt6EOFRKHmUbADtsVIxwoxDi72G2XgJFGO/sHIWxtL jEe564ILufA1XM2Z7eQQXv/Ry7huw+EazzgXQH+j6EQ0IeughuFOPX4bkf9jlHF8EzRT E3dOPLgCMwAHvDa5LimW+fNtQgeES/2fdxpNbSuH/iE9Xft/v/kJM3Ye651E5uqRXQNf MrqQ== X-Gm-Message-State: AOAM532lrTmgnwAVUtwFtgW21MUaCJFbXvs+DXjQuiO+r+4QvtXIu9ws w3dp0aMIRvQ4VBxSSj508XoWp0Y8tna8QjVCDjjJXWQz X-Google-Smtp-Source: ABdhPJz2A+lFcL+KeptzSCGA4FySPLSCdYZD927i7pfGtu4YFTwSAj8MCWSF0xgBASgkjJQ5sJlhHuwY8oCokO7vuI0= X-Received: by 2002:a92:5b86:: with SMTP id c6mr4812964ilg.100.1592332929859; Tue, 16 Jun 2020 11:42:09 -0700 (PDT) MIME-Version: 1.0 From: Ed Maste Date: Tue, 16 Jun 2020 14:41:57 -0400 Message-ID: Subject: Next odd commit affecting `git subtree split` experiments with contrib/elftoolchain To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49mcW74Rlwz4WdH 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 [-0.57 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(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]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.57)[-0.573]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(0.46)[0.462]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.193:from]; NEURAL_HAM_MEDIUM(-0.46)[-0.459]; 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:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[] 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: Tue, 16 Jun 2020 18:42:12 -0000 I'm currently excluding the following additional revisions from mergeinfo parsing (on gig_conv 9ae420c081): 242545 249429 250837 255263 255477 256424 265006 265006 265044 265547 265720 267888 283595 It may not be necessary to exclude all of these - they're just the list I've arrived at, after iterative trial and error. When I run `git subtree split --prefix=contrib/elftoolchain` this includes some legitimate, unnecessary, but innocuous commits - e.g. r298092 is included, which tracks a long-running project branch that brought in elftoolchain updates in MFH commits, but didn't otherwise touch elftoolchain on the branch. These clutter the history slightly but cause no real issue. I've found one new class of strange commit - r265044, which I've excluded from mergeinfo parsing (in the above list). However, svnweb highlights an issue: https://svnweb.freebsd.org/base?limit_changes=0&view=revision&revision=265044 projects/bmake/contrib/elftoolchain/ (Copied from head/contrib/elftoolchain, r265036) It looks like contrib/elftoolchain was added to svn head during the time that the /projects/bmake/ was in use, and brought to that projects branch via a MFH. It looks like this triggers svn2git's existing svn cp-based merge detection. I think svn2git is doing the right thing here, it just legitimately triggers the existing issue/bug in subtree split.