From owner-freebsd-git@freebsd.org Fri Apr 24 20:23:45 2020 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 CC1D42C15F0 for ; Fri, 24 Apr 2020 20:23:45 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (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 4985Gn53G3z44pM; Fri, 24 Apr 2020 20:23:45 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f175.google.com with SMTP id t12so10516390ile.9; Fri, 24 Apr 2020 13:23:45 -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=yGdpAGz+pJfvplJtsvuVwODGOoOveal42MHBmpeK/XU=; b=HHmnR6ti5jv/BI8sODi09KTzEfyZblc0DaXoskdPUGNdvp4sYSTkI5O72FarSxOzn9 RWGOkXr/7ZTfAgr097u6nMYIUThAcz1otfrJ3PhRhSEezvXRigPu4wHeIbXnwf0wIztu L+o8vFP9zIwoMdZarNhIycCRVBWSuV5F9Jp5h8MKLwC8P7r39Hfbx+OPYBFxT3ahgFLx i79x87e/HoYRqIxsGEV8SBO7/Oh1fkNCRMDBB2PfY60ta8oUlzNFnOMgk/3UBcpL418a xUuiuDGjIfm7CPVncmMDqjyXK+2b4gvRT47uO6eMhZkD7I5Ik5pBmC2v0g+bf47r6bM6 16HQ== X-Gm-Message-State: AGi0PuZUuTf5ehct7ZbQWINM+vD393FwHAIgHVp98+lZOcZaXC5O/GX0 uP/avRLDr18x++sKHRC4UcYSxoJJfb6VNJ5RkXQOcPE8 X-Google-Smtp-Source: APiQypLpv8i8xiPPLQtc9dVx/4Q/V9Zq66Mqy7aRVBDRkpqLz07uGoabt/Lumcsbt9UtOPicbvTWYAs0Pv1DqZ0NvCw= X-Received: by 2002:a05:6e02:141:: with SMTP id j1mr10813256ilr.100.1587759823798; Fri, 24 Apr 2020 13:23:43 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 24 Apr 2020 16:23:32 -0400 Message-ID: Subject: Re: SVN Reverse-merges To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4985Gn53G3z44pM X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,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: Fri, 24 Apr 2020 20:23:45 -0000 On Fri, 24 Apr 2020 at 06:51, Ulrich Sp=C3=B6rlein wrote: > > I think for a more recent example like r357366 it's pretty > straightforward that it's a backout of a previous merge. How should > this be dealt with in git? I think re-merging to a previous point of > the git branch would lead to very hard to understand history. Right, I think this should just be ignored in the git conversion, just appear as a regular commit. > I wonder if hoisting all the svn:mergeinfo into git notes would be > feasible and useful. I don't think it's useful. > And then what are we to make of things like r345068? It "merely" > renames/moves a directory within head but deletes 20 lines of > Reverse-merges in the process? I guess it has to delete that > mergeinfo, as the directory is being deleted (well, moved). I think a change like r345068 should also be handled without anything special related to mergeinfo.