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