From owner-svn-src-head@freebsd.org Mon Jun 29 18:09:41 2020 Return-Path: Delivered-To: svn-src-head@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 14AFE350898; Mon, 29 Jun 2020 18:09:41 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49wb9c5Hphz491J; Mon, 29 Jun 2020 18:09:40 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id c16so18167173ioi.9; Mon, 29 Jun 2020 11:09:40 -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=MejSuKe3AmvNTNKsMFcqGWoZXcTRclrEvATJNZXssGw=; b=YXfTKHV5/B7+c0xYTnQROcVZBeQXWnu+4bjs6hPbqw3qIopxge2bpn25pYLJVOVfE8 WVNBxg19bxpvWMZz0cdijRfYm5jbgfqCY8UdgYjaZ4ytF43vB1R4Z6Tlbfp1tGUwHxrH yn7zE4x//ZpdQeHeV31d+heO0lWm/CSCdeYBF7VTe4s71T972s3BeyR37+kaG147f1HC F5DBNbCSgNzownbouaePizLKbPJ/ZkWRi1jExULyelIwM6LflNw7o1ayqnnKxgQPMFqq jvxeJYDqz/SZzaOVI/aMx42YBMwJdoGxjDImsqEHsm7CbhQ0FYboA6vZbp7K1BOBjGwH NMwg== X-Gm-Message-State: AOAM532mam4yU5K7IUAGgxg/8ne7FCQKxP8GQc861TvacNB8zm9yt0h7 Zmhb7ZfAK/1PNgyGYjbK66T3in1kn3qDzHI1aExW+g== X-Google-Smtp-Source: ABdhPJwNQcM5gMuhjHSeVK3lgXBfq3Eg3E/V+9/aIQJbIfwGKrwnYCeJ2o32BQiokZHLW+53+ACn8RSQoAwc+DmLlAY= X-Received: by 2002:a5d:9a97:: with SMTP id c23mr6705792iom.179.1593454178659; Mon, 29 Jun 2020 11:09:38 -0700 (PDT) MIME-Version: 1.0 References: <202006271202.05RC22oR085945@repo.freebsd.org> <2b7f0d0f-e243-9c9c-f1c0-e700e0bf6d48@FreeBSD.org> <577b1bd1-598a-d3f9-3c23-537b9747612a@vangyzen.net> <8670f956-1ed4-2b87-ee64-d04bc37d6810@freebsd.org> In-Reply-To: From: Ed Maste Date: Mon, 29 Jun 2020 14:09:27 -0400 Message-ID: Subject: Re: svn commit: r362681 - in head: contrib/bc contrib/bc/gen contrib/bc/include contrib/bc/locales contrib/bc/manuals contrib/bc/src contrib/bc/src/bc contrib/bc/src/dc contrib/bc/src/history contrib/b... To: John Baldwin Cc: =?UTF-8?B?U3RlZmFuIEXDn2Vy?= , Eric van Gyzen , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49wb9c5Hphz491J X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2020 18:09:41 -0000 On Mon, 29 Jun 2020 at 11:27, John Baldwin wrote: > > I suspect just doing the 'merge --record-only' is the simplest method > assuming Git handles it ok. I suspect since Git ignores mergeinfo this > is fine, but it would be good for Ed to confirm. You can always restore > the tests in the future in contrib/bc when you want to add them. I think a --record-only merge is the best approach; in any case we have a number of these in the tree already and Git will have to deal with them.