From owner-freebsd-git@freebsd.org Fri Nov 22 17:39:22 2019 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 1ED091BCE82 for ; Fri, 22 Nov 2019 17:39:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 47KNw92MQBz42Hy for ; Fri, 22 Nov 2019 17:39:21 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f65.google.com with SMTP id p12so1592631iog.10 for ; Fri, 22 Nov 2019 09:39:21 -0800 (PST) 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=BmuwArEwzumaIDo/KRmd6aDZRJmidSZGeCz1F/NpIe4=; b=b7pf6vjoJpjapufRxvqhzQb4F/JhLG4rYiMHfQ+YjBwXU1oFyB0sjjEEr1A2X+M9U0 o3wjYTbpOmyngG6+GvLSWYSJBR9Z62Y7ADCKw71l14hAwqTuXprorNfSwXda/68ocgEv SxbAC2T5cSmd6mLlP4IkvvBrA2mThApGh3SxvzsLGuq487mIyQONNbvaYVyXZjQCV5r8 Z1x8vvmFVePDq2toEQbntaS4ASWykj/d/L4XCP6sVyDyvff21QqSncMqDn8Ig7Cst8Nw 3cvsf+FEf9eRkGXXBMPsL9B5oYtI7HLFABxZ7/J26wrfBm5yxsdVOuWr+5i4NnUGN5v2 0V5w== X-Gm-Message-State: APjAAAUlJFlqg7NKqYYyNEzLXmfmbcwudeZAlR+Bcoz70xhroe/FW4Ax rO4DgGCra8NG4Ro5N9Cojsn58ly67C10Qc4yh2TubG35 X-Google-Smtp-Source: APXvYqx/IdvbWqc8yxLExdkxn/bdDEetjZBEarHw0VZGItdcxC9R/zzr6vAod5rWFDZO94rJjjkpKHHn3q3GXneDN9A= X-Received: by 2002:a02:c009:: with SMTP id y9mr15454021jai.111.1574444359547; Fri, 22 Nov 2019 09:39:19 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Fri, 22 Nov 2019 08:52:43 -0500 Message-ID: Subject: Another svn-git oddity To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47KNw92MQBz42Hy 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.65 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.10 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; 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(-1.00)[-1.000,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[65.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.10)[ip: (-0.30), ipnet: 209.85.128.0/17(-3.17), asn: 15169(-1.96), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[65.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 22 Nov 2019 17:39:22 -0000 As mentioned before there are some oddities in our git history - svn commits translated to git in a slightly strange way. These have been addressed and if/when we run the conversion from the beginning they'll disappear. I've just found another oddity that affected attempts to use git subtree for prototyping a method of handling vendor code in our tree. I'm not sure yet if the changes to the converter would address this case or not. The affected commits: svn git Headline r300828 00d578928e Create branch for bhyve graphics import. r300829 b1cfc58d46 Initial bhyve native graphics support. r302332 6775e12557 Import bhyve_graphics into CURRENT. Thanks to all who The actual history from svn: - r300828 created projects/bhyve_graphics/ (Copied from head/usr.sbin/bhyve, r300827) - r300829 modified and added files under projects/bhyve_graphics/ - r302332 modified files under head/usr.sbin/bhyve/ and copied other files from projects/bhyve_graphics/ First, creating the branch. The oddity in svn is that a single directory was copied to projects/, not the tree as a whole. "git show 00d578928e" renders the change as deleting almost all of the FreeBSD tree, with a few files copied - e.g.: diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 94046dd8d368..000000000000 --- a/COPYRIGHT +++ /dev/null ... diff --git a/usr.sbin/bhyve/bhyverun.c b/bhyverun.c similarity index 100% rename from usr.sbin/bhyve/bhyverun.c rename to bhyverun.c ... (Of course git doesn't actually store the change as diffs.) Next, some work on the branch. b1cfc58d46 is wholly unremarkable. Some files were added and others were edited under projects/bhyve_graphics/ in svn. In the git mirror they appear at the top of the tree (i.e., bhyverun.c not usr.sbin/bhyverun.c). Finally merging the branch back to head. 6775e12557 is a merge of two hashes: 929f609fc0c1 b1cfc58d46a9. There are some Makefile changes, and some miscellaneous mode changes on newly added files. This trio of commits confuses "git subtree" because it discovers the commit that created the bhyve_graphics project branch via one branch of the merge commit. As a result it decides the initial branch creation commit affects the subtree, and grafts the entire history from that point on into the subtree. This could be addressed either by avoiding the representation of this as a merge in the svn-git conversion, or possibly as a git-subtree bugfix. More investigation is needed to determine the appropriate approach (possibly both). From owner-freebsd-git@freebsd.org Fri Nov 22 19:07:33 2019 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 0EBBC1BEAC7 for ; Fri, 22 Nov 2019 19:07:33 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 47KQsw0b13z46qR for ; Fri, 22 Nov 2019 19:07:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f174.google.com with SMTP id f6so3932167ilh.9 for ; Fri, 22 Nov 2019 11:07:31 -0800 (PST) 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=/7xj6+t5TniuBjhR9k1M1fwKCT3LgGVAHweU2Fq0Cic=; b=BP1GNtu0iN1GU2OQ8GvzV38Z66hyCKNMcl4NvgcYZ2oxBmgSk1strKfmQofVK31sEO 6F80Y2hFcKWL3rOZHgL3VibFYZxQLfafbN6jDsdWRZMB5UvKZx7/FmFgNn3GdlNATMZ2 Tz6Ve8pwpH4YbIb5KA82IfhpkWcJWOd8xv6PWJF6STI8IFVJeZvdlwaycdEaR9T3Salu TGDk4BhXcoCUBZkf/jLB7QZaqaZJPsHBo9QVSt18lu9OrFqZmqGs88DYZLRjYxg0aWJB cJbPmsD0vTsFT10f3nuUgIMx0wzA8LAlG8cecADH3C3Ol8sUQJDaGUPdiHRSq4A60kBD VeXQ== X-Gm-Message-State: APjAAAWRVt1sV3E5rk1OzIkICo6FEtaS/OJ64UmMODXQO/BRTTb9FN8l uGlU9prK+92CuST6lCw0HXpkVjrhqaEQArqQcJDAQw== X-Google-Smtp-Source: APXvYqx7FI2G6TyF3Np6XNLkPTZavbWT0CWrLMHHGyJyLiUjWSOxBn+nH2r+cDXTRkSEn78DTvTl6xegAbtEVD1IePw= X-Received: by 2002:a92:3ad4:: with SMTP id i81mr17673297ilf.18.1574449649935; Fri, 22 Nov 2019 11:07:29 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 22 Nov 2019 10:20:53 -0500 Message-ID: Subject: Re: Another svn-git oddity To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47KQsw0b13z46qR 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.174 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.58 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; 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(-1.00)[-1.000,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[174.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.58)[ip: (-7.70), ipnet: 209.85.128.0/17(-3.17), asn: 15169(-1.96), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[174.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 22 Nov 2019 19:07:33 -0000 On Fri, 22 Nov 2019 at 08:52, Ed Maste wrote: > > This could be addressed either by avoiding the representation of this > as a merge in the svn-git conversion, or possibly as a git-subtree > bugfix. More investigation is needed to determine the appropriate > approach (possibly both). One additional point on this - the 'svn_head' branch in the FreeBSD git mirror is generated by 'git svn', and does not include any git merges. "git subtree split --prefix contrib/elftoolchain upstream/svn_head" gives me a workable split elftoolchain tree.