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.