From owner-freebsd-git@freebsd.org Mon Sep 30 19:17:11 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 3D44312FFEA for ; Mon, 30 Sep 2019 19:17:11 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 46hsbT3zczz4Kgh; Mon, 30 Sep 2019 19:17:09 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qk1-x735.google.com with SMTP id p10so8838091qkg.8; Mon, 30 Sep 2019 12:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=79EPXlsDlkhdpxutjiUQSBS8fwuluLx/1yrv+v2UlkA=; b=hdI3xqPiOYd/cqtxfVY3IQOWpr7JMk3RqvUPipsZrHw7PbB4agk5HcxXvIAezXOnue EPWQT5j6CJM0z+S33orLfD7r7rNyo+Wh/Ra72ZBnvu3+4QTBgKmp0ivzCT5DPSAIKv8A BRJr864Mkke762RYWA/0T8gFAHx1CQgxAMzLJIaxbkUv1ADAcaL5bxdg3+mj8kh90I3G H0B/oFSeBfiAv9QZdx6XUW8FkG5THa+DmHf0euCk18SlLMHHTdxOyTsvmni7csXg+FG2 zX+TRxg5H3HDhGDqWffhhQvEPcJdhnw1E25GYsBBJN+xIq95K9w6nWnCH+cRRTJYa/Qp VS1A== 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=79EPXlsDlkhdpxutjiUQSBS8fwuluLx/1yrv+v2UlkA=; b=doKhnuegkywGnfQstFkpWOc9SvjsTM7yxdOOeECi7IvNEXwg7SZdNOMj4pzq7rle// AZvoXMmXufylkwelw3qAwB6ah/gqLgoybCSuExagZJN5o05Mope/L5NcALtY/jKP3RlD TIQ+c11gcsL4cwsHKrlM+wsQx5b+pcldckKzUuauO8+wy1+m5KX3UKlnX2+Nu86TSj0V lSfNW6BKIaE9dpG0O5ID8WJqToxniTyP70adlZj93/rwz9q63BJDQm0sWNyduXIlXPq/ RY8L6zyQxB8WRvVVqV6L5ii/JYcbK19j9r2jY38ZLluF66VhP81q8suxSef00pEdYvPP W7ZQ== X-Gm-Message-State: APjAAAU02HRYXuIh4mspQHIp6YTHBILmIyvQnapuGI7MxvaZecdLgxa3 dFhCsgVv1dIDznnPi2z+KBxTFxb7FKiPnMW9hYPugMRW X-Google-Smtp-Source: APXvYqzFIZ+DGqbMbrSCgAAQ16Gbe4DqbWU+c8WxS0FheHMJFBgbZI663YRFt7H9tdscvm+nC9dZLJeQ4a/SEc1KSXk= X-Received: by 2002:a37:a858:: with SMTP id r85mr1822292qke.394.1569871028068; Mon, 30 Sep 2019 12:17:08 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ryan Stone Date: Mon, 30 Sep 2019 15:16:56 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ed Maste Cc: Warner Losh , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46hsbT3zczz4Kgh X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=hdI3xqPi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of rysto32@gmail.com designates 2607:f8b0:4864:20::735 as permitted sender) smtp.mailfrom=rysto32@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; IP_SCORE(0.00)[ip: (-9.39), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.17), country: US(-0.05)]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE_FREEMAIL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[5.3.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] 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: Mon, 30 Sep 2019 19:17:11 -0000 On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: > If you try this in a tree with changes (i.e., try applying it to a > long-running merge-based branch) every modified file will result in a > conflict, but they can be trivially resolved in favour of the first > version. From that point on merging from the "new" conversion will > work as expected. You don't have to do this manually. "git merge -s ours origin/svn_head" will record a merge but will not make any changes to the local tree. From owner-freebsd-git@freebsd.org Tue Oct 1 13:39:43 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 13DCB136A5D for ; Tue, 1 Oct 2019 13:39:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (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 46jL3f22jCz3NBQ for ; Tue, 1 Oct 2019 13:39:42 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f44.google.com with SMTP id h144so47914723iof.7 for ; Tue, 01 Oct 2019 06:39:42 -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=1cTatmO5upZjzaD1/E7k8moQAcsKB2YCKxtRDrHOmR8=; b=AaW4hdIdPVDUnLQdM+uBapUC3AU5lUa7XVrFW5EJnI2MLGy2hJxGDY1O2HmTaRh8kw vOHHWN/WxTxJ0yZPrF9Jcvb/isG7rm/wogjU8WcrPNKt+Wbkk7IFSrkqTycGlD6Snb2P HaEwUr+QtAZ2mdXh0H4Tj3vpj1Tspqmr6h6OYiilj9pMdaCtnq313LKEWc2Z55PEgS8x aIaXxc8pTwNKPX9LkU6f1tIXWJ3Yh5sxGA+ZdPpNssAGM87GFiv8lPVs/ZB1kUxidDJ0 X7MzF+XSthQFoKWPPQjlMapETl/Du3rpXw7r93lLHZXqYW/3E6sS8XiyHVGVZGTYkd4v 9URA== X-Gm-Message-State: APjAAAU2TsegtRycTcOIGYVH0ZvfykH0KaRhg7LiQYibo7DSKD5yCYmd Vrx58kiAZiq1IilK/5BWciIHAywhaI4XY+W0+pVhBA== X-Google-Smtp-Source: APXvYqwpF8EibK5Mj4WFbN6gPQSrO03nNKHvJpxzvPDaLnOkfx55Fqg6K+cqpxfB2oM/AVi46QXftCKEjLz+TwkPHNo= X-Received: by 2002:a05:6602:2503:: with SMTP id i3mr6782480ioe.18.1569937181185; Tue, 01 Oct 2019 06:39:41 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 1 Oct 2019 09:39:27 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ryan Stone Cc: Warner Losh , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46jL3f22jCz3NBQ 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.44 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.89 / 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)[44.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.89)[ip: (-3.96), 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]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[44.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:39:43 -0000 On Mon, 30 Sep 2019 at 15:17, Ryan Stone wrote: > > On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: > > If you try this in a tree with changes (i.e., try applying it to a > > long-running merge-based branch) every modified file will result in a > > conflict, but they can be trivially resolved in favour of the first > > version. From that point on merging from the "new" conversion will > > work as expected. > > You don't have to do this manually. "git merge -s ours > origin/svn_head" will record a merge but will not make any changes to > the local tree. Thanks Ryan. So that can be used to trivially accommodate changed hashes in a merge-workflow long-lived downstream project (with the downside that two copies of every commit after the divergence will appear in vanilla `git log`). For a rebase-workflow branch `git rebase --onto` can be used to move commits across a set of changed hashes. For example, assuming we have a branch with commits on top of on origin/master they can be moved to origin/svn_head via: git rebase --onto origin/svn_head origin/master 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. From owner-freebsd-git@freebsd.org Tue Oct 1 14:22:09 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 4E2331379E4 for ; Tue, 1 Oct 2019 14:22:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 46jM0c3dHfz3QQ5 for ; Tue, 1 Oct 2019 14:22:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io1-xd31.google.com with SMTP id h144so48311649iof.7 for ; Tue, 01 Oct 2019 07:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7GnKtsbSjQET99vYRPaqlKo8Hvy4D9uW+T4E5gR3BOY=; b=NitAevDpvXDHglevmHZplTPGcmW0A2HuJB/v4M5gqQQumEq4N2gSBRlGtCsJONn6Ur 3BE9eEwdP96+Tjt3jR8KWvJqyTaiuoHmmcwwHYojKjxfM2463UUE+O1RnjYEQaiJmE/A AATYwVyleE+kgojUc0E55Y34mb+sW6QnOfN6jsVirqc35bja3cLBrF8FHyftP0+gYxRk WnCdO5xSA9acNPnaEXFmj1tCserZM9BuMsFKYl7VMjdoxdlI8qFnSqcxd/4GzzYr4rqq DnyrmIWwFBFw2pJyGlYFkfG2iwkZSmnBYHZS+bwPP2PxZY5RDoaWbbWd4X+xlNze1A1V 5wMA== 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=7GnKtsbSjQET99vYRPaqlKo8Hvy4D9uW+T4E5gR3BOY=; b=TMUdSuF/ZM9NFCbKXAYGsZnoD47kGGLi7wJBmT5Sw0Fp34TETBThHe1zwBuoziudAL rmKSfK0FiM/7gp2wQOXyzXkA333+vLnsiXk/MLw0G6JwikOatc6mSQbVv46euq5K8dmX hDYFKOm9Nu/MC6wSFjhY9qQayjdQjfHA6b/PeC7DM/T1cSDcFw0qzhAy7QptYT/JHP6p Lmw7rDHZfttVamBXhjdEIapJB5d4Y+LPYsSjUX1FIWoButEM8kAkDqhrC/rSFeOvoaAl nRK5il8dW9ZNkYhr8gypnhrQ3YKDjyrrOEU3HXbQj7AVf5JDro+U7EzX0yZ5iQR3DkkP ucEw== X-Gm-Message-State: APjAAAVkLLTMAr+uF6sjRjOGWt9JrfGn+vsH6rqpIA2hSRfnK8hk/5iT VXUjRgxWY1+m3IFdDG4BnD5ZS3Ced8GsZZP+rUrrUogR X-Google-Smtp-Source: APXvYqyu7FZ+eQBiUA/NUL3TaFK2MWEJeXtNDaNmuRg0qy4UhriFZaEPq9YIYBUVi4vYvH9sbBZs/6Vv7uap6cB/vSk= X-Received: by 2002:a05:620a:6af:: with SMTP id i15mr6093453qkh.380.1569939726481; Tue, 01 Oct 2019 07:22:06 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 1 Oct 2019 08:21:55 -0600 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ryan Stone Cc: Ed Maste , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= X-Rspamd-Queue-Id: 46jM0c3dHfz3QQ5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=NitAevDp; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::d31) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[1.3.d.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.12)[ip: (-5.82), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.16), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 14:22:09 -0000 On Mon, Sep 30, 2019 at 1:17 PM Ryan Stone wrote: > On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: > > If you try this in a tree with changes (i.e., try applying it to a > > long-running merge-based branch) every modified file will result in a > > conflict, but they can be trivially resolved in favour of the first > > version. From that point on merging from the "new" conversion will > > work as expected. > > You don't have to do this manually. "git merge -s ours > origin/svn_head" will record a merge but will not make any changes to > the local tree. > I'm confused by this. origin/svn_head points to the tip of svn_head upstream. This is likely different than the last merge point of ours, so I'm unclear how this wouldn't bring in extra changes (or blindly say that those revisions had already been merged). You need to merge in the origin/newhash tree at the same svn revision as the current tree to do a zero-change merge. As such, you'd need some automation around this. i've run afoul of this sort of thing in other projects, and want to make sure that the issues there don't apply here. I'll see if this actually works by pushing one of my git svn trees that has the different hashes to github and trying to merge our work tree to that instead of the current FreeBSD upstream. Warner From owner-freebsd-git@freebsd.org Tue Oct 1 14:32:04 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 E9243137E95 for ; Tue, 1 Oct 2019 14:32:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 46jMD36hwFz3R9P for ; Tue, 1 Oct 2019 14:32:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x733.google.com with SMTP id y189so11434572qkc.3 for ; Tue, 01 Oct 2019 07:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Hxly4NBYdzK73CIqz/TaaJjtfQzeX+Zrj1dVOVHB/Z8=; b=CaRmnU4ECCbVGxt82RbtwRceAzEJty6S74JBcSAQOjtXwbntgGZzKLK+B7ZkEbhepc lnW5DLevlwSGYFPkk+YjoVDsgovRSCCdkN8zpZvD5bkYNRjz9cbzFtLW4s3IqGjLUSCU dzWaOa6qZk9yLOkTanu0PfdIH9BFLarqz2oKkNnWwaf75A4cZ7Mof4DpbwKCgbNC75IY hd7/AHjczz8hV4JEOje2LQCkrnzV5xy9kEuY/ovJSJv1En2NaXc8LH5+fFYpTje39EL2 rlIa1lciQdy3OYUKQag2PwNhTftKJ6fzdxUHnbML27wLtTOCMTeXnPtXJIrVzbLU23Ov ddbA== 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=Hxly4NBYdzK73CIqz/TaaJjtfQzeX+Zrj1dVOVHB/Z8=; b=X8jnzBLaiZzYGbLxKo+W9oLtWVZ9avOzUBWKrVAOtF4gNfL8N9H+8mZuQc03GWLUwy 4v1PfzxLxVcmbBwhO58N5ZjdPe2xcQ0S1rlDxqVdlSI6TJKbB4U21+J2uhWuaLBAtTlp FtCZkGVmPdWiASu2ie7B14RtO03Le8Vs8xt6NEsIhnlnYEV/q/dUDd9WzuG4bSbBPf2m frdvq4S4m/swSLRn9iEj9ysB4y3z7OdFdSYgjJf1GccPovqNkFn+NezGSKfINyDfyy2m CKwK3FL4WJyndBL3iIW6UFwXAJD3rT6Iv4473laXtxzWXnB+Vu5kDB7LQ05xQifFGvd7 oiXg== X-Gm-Message-State: APjAAAX6mN1IhMl6t3+ENouC1Z5cnHB0VYXhjXnExQwSKxpYupIbLPTB D9Z5Gx2AbfF0pz4CDDbKB/K2VYbnRe3Y3BYfYG866Dmn X-Google-Smtp-Source: APXvYqzw6XyL4lMd26os/9Et90hVq0sAqj7zzQ3Ld3q6pEkEVyFgQFute682xKB68t20yXMZjY17Mtasd5M4q1MnJnc= X-Received: by 2002:a37:6787:: with SMTP id b129mr6526279qkc.60.1569940322648; Tue, 01 Oct 2019 07:32:02 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 1 Oct 2019 08:31:51 -0600 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ed Maste Cc: Ryan Stone , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= X-Rspamd-Queue-Id: 46jMD36hwFz3R9P X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=CaRmnU4E; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::733) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.82 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.82)[ip: (-9.31), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.16), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 14:32:05 -0000 On Tue, Oct 1, 2019 at 7:39 AM Ed Maste wrote: > On Mon, 30 Sep 2019 at 15:17, Ryan Stone wrote: > > > > On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: > > > If you try this in a tree with changes (i.e., try applying it to a > > > long-running merge-based branch) every modified file will result in a > > > conflict, but they can be trivially resolved in favour of the first > > > version. From that point on merging from the "new" conversion will > > > work as expected. > > > > You don't have to do this manually. "git merge -s ours > > origin/svn_head" will record a merge but will not make any changes to > > the local tree. > > Thanks Ryan. So that can be used to trivially accommodate changed > hashes in a merge-workflow long-lived downstream project (with the > downside that two copies of every commit after the divergence will > appear in vanilla `git log`). > I'm pretty sure you'd need to merge to the same svn rev in the new-hash branch as your last merge point, though. I need to test that, though. Usually a merge is to the top of the thing you are merging, so some caution is needed. And all the -s does is accept all our 'conflicts'.... For a rebase-workflow branch `git rebase --onto` can be used to move > commits across a set of changed hashes. For example, assuming we have > a branch with commits on top of on origin/master they can be moved to > origin/svn_head via: > > git rebase --onto origin/svn_head origin/master > kinda. It would rebase the current branch onto the new tip of svn_head, not the current branch point. This isn't quite what you want in many cases because it will pull in new changes. The --onto arg needs to be the same svn rev in the new-stream as the current common ancestor of the current branch and origin/master. And while it's often convenient to do this, if the new changes have merge conflicts, then you have to cope with those or abort the rebase. If you are looking for something that's an exact leap sidewise, it's less trivial to do. And while many people may be able to make the jump forward, we need to have a good story for those that can't. it can be scripted, I'm sure, and we should provide those scripts. So for a single tree, with a single branch, I'll grant trivial. I have 3 or 4 trees now with a total of about 100 branches in various stages of WIPness. For that, it's not at all trivial because maybe 10 of the WIP trees haven't been merged forward in a while due to conflicts that I've not had time to resolve. Warner From owner-freebsd-git@freebsd.org Tue Oct 1 14:40:36 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 57D4E138117 for ; Tue, 1 Oct 2019 14:40:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 46jMPv37Zlz3wyV for ; Tue, 1 Oct 2019 14:40:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x833.google.com with SMTP id 3so21927303qta.1 for ; Tue, 01 Oct 2019 07:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IpG75KnAvQYK6l6X3eN50GBySaKsQ3sVmm1yKfoLFg8=; b=XPSx8+bdNhiQCpEAVT0jQE/Phf1vLnh1wDH719vsEYTJugETlAUfWI2+lVjyrJCdgv qcftuqH5YLQJy/boEDgJqM3nR2pvbqu0bkz5rtmuJtyBe6d6pxJgwzyS4xQkJo94X5r4 /YqMnogDeoA02yjTEidGrgGQyDvzToAcb2FUQjVUxQDIVj6W+kRzXZIIqwlj3VnJx/Af kN6dzHpktTsa9/9fr0grAEUeJ1GoqqOEJQc5rt/FzNdG4fbNvZGjBiokz6Ff9R60qtMA m6RX4sCA4IT6ZdHPqcVEi+b39nsKgmVpIp5IW4OPcTW7zxQmEDZe37N+Qew+y1dixAKz eqSw== 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=IpG75KnAvQYK6l6X3eN50GBySaKsQ3sVmm1yKfoLFg8=; b=l8calRg8gfdPAT+GbX+egCzoO2UhHJqKLlvdQgo6W2a7xuNPSTw91w45CP2ensv8dI 7lJw3DluJ3IPl7qWna5u5jqD4c/bJyq3ospewmXXpaB3WlfjZ9P77XrnDagkisnr84tI nMiAFANzDIJVUShoZLlCt/GXlrJIgB2TlRUHJXZrBYkTz46KlpLacG+d3YleP12bgDT8 Yy4HGWOnTwxQsc5TY3ujKkuPc0s6Z3flfUGjgoC5psdsKgkSTSxTY+zmh/zJ6P/fFChn gc4MAgBSk3EIK9cJOzI3i1ujSunC1E38Fg4iG/Y3VlS2O2HOh/ZXlrtwrKmvrWcEa/u1 /oFQ== X-Gm-Message-State: APjAAAVcK0QsWlgEXB5ndH9p3hTanN2gg75lB/gO9q0gvXs4lV1rSW9+ xxvk91DFEqqTBaS9tdizYCSbKgBQdp4lZHJS1a+sFQ== X-Google-Smtp-Source: APXvYqzQi1b/QjRRT56XkF1G4OgvTJxVbrJQ2oBtk6gqeiaDrDfAjFRRbg7Z8j2EbcK1WbazEYSY5AnMYmvdPIO80CQ= X-Received: by 2002:a0c:8a4f:: with SMTP id 15mr25022372qvu.188.1569940833973; Tue, 01 Oct 2019 07:40:33 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 1 Oct 2019 08:40:22 -0600 Message-ID: Subject: Re: Service disruption: git converter currently down To: Ed Maste Cc: Sean Chittenden , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= X-Rspamd-Queue-Id: 46jMPv37Zlz3wyV X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=XPSx8+bd; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::833) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.82 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.82)[ip: (-9.30), ipnet: 2607:f8b0::/32(-2.58), asn: 15169(-2.16), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 14:40:36 -0000 On Tue, Oct 1, 2019 at 7:48 AM Ed Maste wrote: > 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. > You do see all the MERGE commits still, though, with --first-parent. you just don't see all the extra commits they refer to. It excludes the 9000 phantom commits but not the merge point that brings them in. The same would be true of other upstream merges. > > 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. > My experience with rebasing our work qemu bsd-user branch suggests that even with the 'common ancestor' there's no end of trouble with you introduce a lot of merges and once you get more than a few hundred (or maybe a few thousand) commits away from a common ancestor, things break down and need careful study... When git works, it's awesome, but when it doesn't, it's a very rough ride and it's fear of that rough ride that has me asking all the questions and wanting to know the exact details. When 1000 downstream trees convert, we don't want more than a couple of them having issues or we'll be overwhelmed and we'll risk alienating our users. > > 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. > Right. The proof is in the pudding, as they say. > 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. > I totally agree. It would be trivial to push master-newhash at any time and that would be 100% non-disruptive. I'm less optimistic about having a ng merged thing work, but if it does we can publish. Is there an easy way for me to run the new conversion script to create a stream that won't push to FreeBSD's github upstream automatically? Warner From owner-freebsd-git@freebsd.org Tue Oct 1 16:37:31 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 C281313A40F for ; Tue, 1 Oct 2019 16:37:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (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 46jQ0p6JY4z43YM for ; Tue, 1 Oct 2019 16:37:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f45.google.com with SMTP id v2so49526643iob.10 for ; Tue, 01 Oct 2019 09:37:30 -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=qvOGhXFo9VbfX6s0y+u8Qww7L7EthCiPPnAGymtmoO4=; b=CAplzaEySvYaYHPnCeO51rtU7zLtJdegSRtiw5LDPY5wbSvyMmvw36AHWs0i2CU9JK A3sKa/6oaW5Scq5XwCZL+HK++8fyd94gzg3rA6agy21YX0pW0XgWKCrvD1tmD2Nt2w1r E5QWMvKqKNoBJrN7L31FbATdhsPxOhXYkrNZVjrFy7TtzQf/1e6DnkdCJ4Wp9eX/KvKX AXAokYpEZXeouvYVaZv3egYAmbJ4NkzTFWT/3nk+giBmB388LDJZEaVD81yvou/M0/gS Ndt9qwlPbauGqyJJIKA6SHImBJl9xWt83SOpfTueEr6Sb2j8+Q7JqKLlgZvlXITGQ83N hyJA== X-Gm-Message-State: APjAAAV1boi4JSfbGl/1HyPPclVBJkVGGO+Xt0hEbOkYKBB8XL5oyXKG 0SLLE2xynyndpQ5ReHUG8PXVg+j1dC69jbO6JtA= X-Google-Smtp-Source: APXvYqxlLYjxSUP3U+caIgaTcF0cVgXvoHaTy38MhaNRUgAJXJVZ/DMr47RHjWLCr9/ZUJg7Xb+PcWCVZZRNipisqMA= X-Received: by 2002:a92:c691:: with SMTP id o17mr26737428ilg.185.1569947849727; Tue, 01 Oct 2019 09:37:29 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 1 Oct 2019 12:37:17 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Warner Losh Cc: Ryan Stone , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46jQ0p6JY4z43YM 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.45 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.12 / 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)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; 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)[45.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.12)[ip: (-5.10), 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)[45.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)[]; FREEMAIL_CC(0.00)[gmail.com] 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 16:37:31 -0000 On Tue, 1 Oct 2019 at 10:22, Warner Losh wrote: > > On Mon, Sep 30, 2019 at 1:17 PM Ryan Stone wrote: >> >> On Thu, Sep 26, 2019 at 10:27 AM Ed Maste wrote: >> > If you try this in a tree with changes (i.e., try applying it to a >> > long-running merge-based branch) every modified file will result in a >> > conflict, but they can be trivially resolved in favour of the first >> > version. From that point on merging from the "new" conversion will >> > work as expected. >> >> You don't have to do this manually. "git merge -s ours >> origin/svn_head" will record a merge but will not make any changes to >> the local tree. > > > I'm confused by this. origin/svn_head points to the tip of svn_head upstr= eam. This is likely different than the last merge point of ours, so I'm unc= lear how this wouldn't bring in extra changes (or blindly say that those re= visions had already been merged). You need to merge in the origin/newhash t= ree at the same svn revision as the current tree to do a zero-change merge.= As such, you'd need some automation around this. i've run afoul of this so= rt of thing in other projects, and want to make sure that the issues there = don't apply here. Yes, you need to already have the "old" version of the same tree you're going to merge from in place. The full procedure would be something like: % git fetch origin % git diff origin/master origin/svn_head # confirm identical % git merge origin/master % git merge -s ours origin/svn_head > I'll see if this actually works by pushing one of my git svn trees that h= as the different hashes to github and trying to merge our work tree to that= instead of the current FreeBSD upstream. That'd be great, allowing for experimentation with concrete examples. From owner-freebsd-git@freebsd.org Tue Oct 1 16:51: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 B71FD13AB93 for ; Tue, 1 Oct 2019 16:51:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (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 46jQJS600jz44T0 for ; Tue, 1 Oct 2019 16:51:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f54.google.com with SMTP id c6so49586463ioo.13 for ; Tue, 01 Oct 2019 09:51: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:content-transfer-encoding; bh=LtZu2UB9FuZwTHXxswrqUXhLVoMWwEFUDywcovj0ZCw=; b=PqajpRCOtBV8v+a71VTwlCCn9HSLIX2lYLYlixT/bOdKx2sqxzSl37b9bfi19Mq1n3 XQ5m3Zablnz1ilOIllEGLsf4cwj3t+TYcOEvBkLG+G8zclEB5VzgeILqt1+htdh6GeBw bBolTVkfUkuSLstRsZ3j86Ikw5QAo9GuCVpg+wbrWQzEO3UOh/irktB+c9rtwkvjaDkS ZwafK0wiot7bHJP2uOtNYl0nYS1EmCuQ45Sre+qDSTERoHF+N+uwXq6H09v33tBd2Djf liLIOsE63NwWDBGcXsmG+krWzC1Xhl8I1RUW6fwW3Vp47tkrfl5JzLanfcLvX7UluPaL /DLA== X-Gm-Message-State: APjAAAXHeF4yIv7S/K/DTaAW3rBmlbKRVhW9xWqHDI7GiigokE0s+WXY H5I3Qp3bDAV/rHuk6ttRm/CfFj55C8bGJhGYtnM= X-Google-Smtp-Source: APXvYqwNmPcE77FUAKuPMn/xYeOvaKGH8qanFTcGGSxMCD3O5NQwhUf7lEg81zKDgsJQDExSbywWUjeteKCN3CVFfeo= X-Received: by 2002:a92:995a:: with SMTP id p87mr27134452ili.115.1569948663143; Tue, 01 Oct 2019 09:51:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 1 Oct 2019 12:50:50 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Warner Losh Cc: Ryan Stone , freebsd-git@freebsd.org, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46jQJS600jz44T0 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.54 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.23 / 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)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; 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)[54.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.23)[ip: (-5.65), 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)[54.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)[]; FREEMAIL_CC(0.00)[gmail.com] 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 16:51:05 -0000 On Tue, 1 Oct 2019 at 10:32, Warner Losh wrote: > > I'm pretty sure you'd need to merge to the same svn rev in the new-hash b= ranch as your last merge point, though. I need to test that, though. Usuall= y a merge is to the top of the thing you are merging, so some caution is ne= eded. And all the -s does is accept all our 'conflicts'.... Yes, I've been assuming (and my experiments have been) with an up-to-date origin/master already merged into my working tree, and an up-to-date svn_head that exactly matches origin/master. There are a few different ways this could be done in a non-experimental situation, and we should experiment with various ones before anything is finalized. >> git rebase --onto origin/svn_head origin/master > > kinda. It would rebase the current branch onto the new tip of svn_head, n= ot the current branch point. This isn't quite what you want in many cases b= ecause it will pull in new changes. The --onto arg needs to be the same svn= rev in the new-stream as the current common ancestor of the current branch= and origin/master. Indeed - in my experiments they are one and the same - there are no new changes in origin/master that are not yet in my working tree. I guess the rule of thumb should be that work to address changed upstream hashes should not involve any new changes, and thus cannot have any conflicts. In my experiments that's most easily achieved by starting with everything up-to-date. > So for a single tree, with a single branch, I'll grant trivial. I have 3 = or 4 trees now with a total of about 100 branches in various stages of WIPn= ess. For that, it's not at all trivial because maybe 10 of the WIP trees ha= ven't been merged forward in a while due to conflicts that I've not had tim= e to resolve. I'll grant you even a trivial action multiplied by 100 could extend to a reasonable effort :) However, in any scenario you're going to have significant effort to deal with those 10 WIP trees. If we published both "old" and "new" versions of the conversion for some reasonable period you can choose when you spend the time to update those trees, and then perform the (individually) trivial migration to the new view.