From owner-freebsd-git@freebsd.org Fri Apr 24 10:51:40 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 834E52AF64F for ; Fri, 24 Apr 2020 10:51:40 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.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 497rZg1PDtz496n for ; Fri, 24 Apr 2020 10:51:38 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f54.google.com with SMTP id e26so11631602otr.2 for ; Fri, 24 Apr 2020 03:51:38 -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:from:date:message-id:subject:to; bh=tphz/M2eyqu4g8JhGdiC7jKoP5C3fTXOcTtNufMkptw=; b=trD1gXSDx40E4ZUw+r9qVmeWDfGC7w+IsBoCcGLktLVDjp8beSLuZJ7O/mn57njlgr Wlxc6OO5sqK3Oy+LH9G1Vtw3177SJuDFRKz2YxhCjBzYjL6HO06VL1C7Gp4M3BGFnzMe 9PCYgdoIM4j7EEjM39MNSrlUu3mqMbnHTzjhRXN+66YdWPmGmsXe49gISUUZXWr31dcn fyW8RpzTzHrgHzGjPaRf9HfnSpGRAYEhLyVbHH0AGy3lwBTNeyrGNLyOjo4+vGOemyRn tRjFmScmRMO2iZMgTCLcnk/mwhvDMVb3hptXZ9lBg8YlRyKKRUgXcotr2wuaCxX7qTIs jzTA== X-Gm-Message-State: AGi0PuZEBtbTGhjB5GhTJfLXCrdur6IxXeIyhRPe00JapZJiCyYf9VZf nqI7+DFCZVc8QFv4CO2j6RoB/XtkJwOTGHDrmgn4Jfwf X-Google-Smtp-Source: APiQypIwIhK/p+GW+7JxGxisscJyaP7mNNMkE7PCzJNubluhYHVUazkrgzHPj3XhD0SL+Vn17cmee3U8jsk9Vvznyn0= X-Received: by 2002:a9d:3a45:: with SMTP id j63mr6655207otc.71.1587725496756; Fri, 24 Apr 2020 03:51:36 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Fri, 24 Apr 2020 12:51:24 +0200 Message-ID: Subject: SVN Reverse-merges To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 497rZg1PDtz496n X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.22 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[54.210.85.209.rep.mailspike.net : 127.0.0.18]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[54.210.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.22)[ip: (-0.25), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; DMARC_NA(0.00)[freebsd.org]; 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)[uqs@freebsd.org,uspoerlein@gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] 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 10:51:40 -0000 Hi all I read a bit about what a reverse-merge is supposed to be, but don't quite fully understand what is happening here. We have at least 3000 instances of reverse-merged mergeinfo in the repo. E.g. r181092 ------------------------------------------------------------------------ r181092 | des | 2008-08-01 02:34:37 +0200 (Fri, 01 Aug 2008) | 2 lines Changed paths: M /head/crypto/openssh M /head/crypto/openssh/version.c Ugh. Set svn:mergeinfo correctly. ------------------------------------------------------------------------ Index: head/crypto/openssh =================================================================== --- head/crypto/openssh (revision 181091) +++ head/crypto/openssh (revision 181092) Property changes on: head/crypto/openssh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head/crypto/openssh:r53875-164146 Note that it always _removes_ the Reverse-merged svn:mergeinfo. 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. I wonder if hoisting all the svn:mergeinfo into git notes would be feasible and 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). Cheers Uli