From owner-freebsd-git@freebsd.org Tue Oct 1 13:48:21 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 02D37136D35 for ; Tue, 1 Oct 2019 13:48:21 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) (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 46jLFc0xygz3NcM for ; Tue, 1 Oct 2019 13:48:19 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f66.google.com with SMTP id v2so47959883iob.10 for ; Tue, 01 Oct 2019 06:48:19 -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=w/y6TWGdb+P1sOJErRjiIC07731sO6zUCralSpXvJcM=; b=FY5uhxW9hmjRwS8Go24HldDBivqBWeQhQOwhy/yJkY9EH10/ou51o4xZIV7teaqmtC uTIIkPC4SvKuXI4JalbKzj9LMNPmUrr++TEVcrhI4GHg1IkjxwptcPNHbi7AQMLjDtb5 TeTABw6lGHu7gUaryT7eV8BLZlz5KD7bKyIWkrpy4zMN3a5YLMCDUViUBubFoafcQaUW Y0ruKJunc23aD7ueawoS2xVNN3Jj+DqHO3Fmp4ElvjauzvtObk+5FQqwWYrrFwujCCRD rP6fSJ3qILU22Kbrrou7ZBKbZtQi973i8QasbWsVj40NNI2haruuQx09knIik+R39SF4 rxCA== X-Gm-Message-State: APjAAAVHqIyXJPKww6aa3RKaJKo+xDY+H02A3QfyVLA1pGbkF+jqlVlT hWy4MFCWs+Z59U37I87RlaTqa6fqk3rireMPgp4= X-Google-Smtp-Source: APXvYqyMCSjvWQyBx8cbIOaf5KaVaPemsTqgmN7rTGTNhkDz1WeyXUBW0/sHvCNrO1TEdtLZVP5CsnE6eV4K5Qi+edQ= X-Received: by 2002:a92:c691:: with SMTP id o17mr25817165ilg.185.1569937699038; Tue, 01 Oct 2019 06:48:19 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 1 Oct 2019 09:48:04 -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: 46jLFc0xygz3NcM 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.66 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.19 / 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)[66.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.19)[ip: (-0.43), ipnet: 209.85.128.0/17(-3.28), asn: 15169(-2.16), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.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: Tue, 01 Oct 2019 13:48:21 -0000 On Thu, 26 Sep 2019 at 13:26, Warner Losh wrote: > > The --first-parent actually mirrors what svn log shows today. What commits do you think that it omits? Right, my comment was in regards to use in my 'wipbsd' merge-based git branch. A git merge-based workflow is fundamentally not possible with svn, so what svn log can show isn't all that interesting :) What I mean is that I can either git log without --first-parent, and see all changes including the 9000 "phantom" commits, or I can git log with --first-parent which excludes those phantom commits, but also excludes commits I do want to see because when I merge from upstream/master both parents are important - my work, and new upstream commits. > I'll have to try that to see how well it works. I'd not used allow-unrelated-histories and had frequently run into this issue. In the past, I'd been warned off using that flag, but I'll give it another try. I presume it can cause a lot of grief on truly unrelated trees, but in this case we have two trees with no commit objects in common, but in fact do have tree objects in common. > We basically have an upstream called 'FreeBSD' that we fetch into our git repo: [omitted] Thanks, so it's basically a regular merge workflow with the added fun of subtrees; some experimentation is going to be necessary here but I believe it will be possible to use the same techniques. Presumably we could publish two ongoing svn2git conversions during an overlap period (existing, and corrected), as well as a snapshot of merging existing into ng. A one time merge of that (instead of FreeBSD/master in your example above) would bridge the gap to the ng conversion.