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.