From owner-freebsd-git@freebsd.org Wed Mar 25 19:41:22 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 46FFB261ADC for ; Wed, 25 Mar 2020 19:41:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48ndlW1m52z3HG9 for ; Wed, 25 Mar 2020 19:41:11 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id B7A83261AA6; Wed, 25 Mar 2020 19:41:03 +0000 (UTC) Delivered-To: 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 9977C261AA5 for ; Wed, 25 Mar 2020 19:41:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (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 48ndlC0BR2z3H8x for ; Wed, 25 Mar 2020 19:40:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-pg1-f194.google.com with SMTP id u12so1645162pgb.10 for ; Wed, 25 Mar 2020 12:40:54 -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:content-transfer-encoding; bh=GzsPn2bvCCrmzBeDHla2wOr6c3kyXqKOsh9VQUuL28A=; b=UA5yPGGhu4B1YLf/31rg17s0qSz0W7BpEwuHwP97dUUa6MuYo3gGCWW4xptYztWQwJ 5cRj18erLwGS04U2K+iXyzy2pAsAXHOPHj3gudHsDqML1101bh/fqezJY41jkz3EuGcm Qa/5OPdY0ypNy2gAsL0woE6fRrpeBJqiYVMS0U0vD7Th0KqynIVnxGWYlrTOQgJ03fdw D5ivmZz+iabIyhZUXsFmSbNm24oavZs9mfO+6CwQnMTfK+nDrEqhCPb05Wb1anlGvrpr iWMaPuxI8MxIhNr5jEJUqGjlqQE6BJNcqFNHwVlez53e0GPTQzBV92ZVAqJoBQtEfJ7L YRRA== X-Gm-Message-State: ANhLgQ3lGvGaOz+77STcq6ig0Br/cHMgEFgNE+A17HGIf4jR8139o8Lb +YOqjEH40rowG9ee8TyPd6jp05k+X/N1lbO47am6657Y X-Google-Smtp-Source: ADFU+vuSDTCeP9qbmgghUELMfZJ9KhVHJrIINGLVVPIM6/wkICuhCUytfkkr0hallx9/Dzpq3x6rM7FOcncYbCpGFbA= X-Received: by 2002:a92:cb09:: with SMTP id s9mr4850925ilo.182.1585164782276; Wed, 25 Mar 2020 12:33:02 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 25 Mar 2020 15:32:49 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48ndlC0BR2z3H8x 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.215.194 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.44 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[194.215.85.209.list.dnswl.org : 127.0.5.0]; RWL_MAILSPIKE_GOOD(0.00)[194.215.85.209.rep.mailspike.net : 127.0.0.18]; IP_SCORE(-0.44)[ip: (-0.00), ipnet: 209.85.128.0/17(-1.65), asn: 15169(-0.48), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; 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)[]; RCVD_COUNT_TWO(0.00)[2] 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: Wed, 25 Mar 2020 19:41:22 -0000 On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein w= rote: > > This is intentional, please see https://github.com/freebsd/svn2git/blob/1= a0b3e0230e1b2430e5d8eb91ac99aeff5a1614d/src/svn.cpp#L883 > > Only projects and user branches are represented as merges to master, as t= hey usually have a full tree. This seemed to match the git model better (as= opposed to the SVN model). IMO we do want vendor code updates recorded as merges. This is already happening today for certain updates (svn merge -c updates I believe). For example my most recent ELF Tool Chain vendor update: https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6ba4= 0c12ac5