From owner-freebsd-git@freebsd.org Wed Sep 25 17:56:05 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 9F93512E86B for ; Wed, 25 Sep 2019 17:56:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) (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 46dm2D5LCMz4FmQ for ; Wed, 25 Sep 2019 17:56:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f50.google.com with SMTP id b19so1104771iob.4 for ; Wed, 25 Sep 2019 10:56:04 -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=NQTxpy0uQggKkHW4u+siYOURpjRIRrFotdRm9E7f55c=; b=ENVSe9QiX0DkPnrdM+Piz2Jf0er5IHUwRRVqH5zNcrOnobPn9BKuDfPwvPK8QPpKCL KoJ1mLMMAQpcQKFpm9ZNOavg1EoXAM92nwBOPmzZYBgxxYb7mjHrFty9HSt2WOE9A8c4 9/7X0zJCXig+VShD2My5d2NdyJq7vKpeztq7oFc/Ei+uWjKlHNvCPzL25DsaCpEzjMg6 XQnixqBKW15M2jGk6mZt7snSsvbjZbLa83getAQSPBmLqd1VvwRDmEEsvf9lsW38CI+f KgFIMIi0ekCHXnWEvCUPOo/ScRtyf/cw68Q3Gl3YENU9yedthhOIyq788/1qoofSy2sz BwNQ== X-Gm-Message-State: APjAAAXMOhevXPVb+9uaDbTHjeSs2S6PbFYGbafiQsABGLlXILRk6Ax+ 99HKPABtE8iiaKjP66xztPGQ7dEJ6dxlQfqVbN4= X-Google-Smtp-Source: APXvYqz1K1gqWN/fyQ2HCiNEF2h71bg3mhloOnapgPL3O44mtd7Dtpr72c+doUVFxcNyxSQKQqY0pFRl113yjTzQzWg= X-Received: by 2002:a02:1c02:: with SMTP id c2mr6536913jac.118.1569434163227; Wed, 25 Sep 2019 10:56:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 25 Sep 2019 13:55:51 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Warner Losh Cc: Sean Chittenden , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46dm2D5LCMz4FmQ 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.50 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.37 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; 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)[freebsd-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)[50.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.37)[ip: (-6.33), ipnet: 209.85.128.0/17(-3.29), asn: 15169(-2.18), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[50.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)[]; 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 Sep 2019 17:56:05 -0000 On Wed, 25 Sep 2019 at 10:53, Warner Losh wrote: > > But this really was a merge from stable/10 into master, I think this is just a question of semantics, not VCS details - I would argue that it is not a merge in the ordinary sense of the word, and is certainly not a merge in the git sense. You're right that this should be represented in history as if it were a cherry pick. Bogusly adding over 9000 commits to the history is definitely not the "least wrong" thing the conversion could do. git log --first-parent isn't really a solution here either, because there are cases where one legitimately does want history from both parents, especially working in downstream projects. > I'd offer the opinion that needing to know about things like git log --first-parent vs having to rebase every single downstream fork, We won't need to rebase every fork - in no case should the path forward be worse than uqs's suggestion of a merge from both old/new conversions.