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.