From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Is vc-diff-mergebase broken on master? Date: Fri, 3 Sep 2021 02:21:26 +0300 Message-ID: <7b6753e7-1bde-4a1c-e0b3-02a63adec84c@yandex.ru> References: <87a6kyacqn.fsf@gmail.com> <89f53c5f-3936-bfb1-eb47-11c9a6bd8e5c@yandex.ru> <87o89avba8.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18351"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 Cc: emacs-devel@gnu.org To: Matthias Meulien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Sep 03 01:22:21 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLw2G-0004ZX-Kb for ged-emacs-devel@m.gmane-mx.org; Fri, 03 Sep 2021 01:22:20 +0200 Original-Received: from localhost ([::1]:52346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLw2E-00027C-Mo for ged-emacs-devel@m.gmane-mx.org; Thu, 02 Sep 2021 19:22:18 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLw1U-0001R9-Se for emacs-devel@gnu.org; Thu, 02 Sep 2021 19:21:33 -0400 Original-Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLw1S-0002YE-GC for emacs-devel@gnu.org; Thu, 02 Sep 2021 19:21:32 -0400 Original-Received: by mail-wr1-x42b.google.com with SMTP id b6so5461922wrh.10 for ; Thu, 02 Sep 2021 16:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=n3dIFTstjkfQyxBE/3PI8S62hc0Mf4lQrMddNuN9X4c=; b=qFyg0jAPwkbZYBv/TnX3Jn6uYHCwo2FKAI/b+axix7O/n66T85CLpyPMa2gIBk4mrl agv2PcZfW+SDh1Q/G91p4AQ3BLanlPn+M4RkRHWT270I4dhRL5ea9NvJwHOzvCcgm5P/ Sz7sUxnUzftvFjPaYAf9Mc2SCv6BxNlP6CxjTLLkPkgH31aYphEnYqbV6DBlpnujrCZS /LW97IBJ+UTkclnIYcZNkPLqt1C2/xbD5VBBUmVwkMM0NMJ5dLPv5VS6Yn2KjqjUyaR7 DToTx1nnn0R//1/NpFOTqpqkzg1qQGbpYm9/Qy0hOMr0qCVZySW2tuRdE3KwIzgWDBYC hkFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=n3dIFTstjkfQyxBE/3PI8S62hc0Mf4lQrMddNuN9X4c=; b=Q9OzCdNcotj1Tj/AV0aLa6vfulQb3uXvlGocAn86OPiC+86motQRDD7TnPX8dOQKVU UxpAhjS480T8l5LkrJYVv+MJ5JvQqXkfzSLAugxwmjq1c42ZL0LxCYnsCRVQzQ3GUlhu lyqiTO5G7IhSpq3Cgmp4JSuI5NGyt27YqU433HqmKzNQ/DajyIS2FDC/UFX+/HSlJciw F0CHeP7yHNoxXP8vSmNIN9IFXUYtvM+Fu71AlfsH416w/tMnnwMP4zot9O4SYi76DAnl C1n/uAFkaYUfk45HVpH8DWgXHuZkwHxhx3FBij7DLi37LrieNyqA6hm457F7mM/8R1Rt Jh2A== X-Gm-Message-State: AOAM531FmROlEDnc0Ezu414RP3qR3ed2h2oX3BjNoQeRf1ikf9AKGMFf yrEY5o+NGmeKS9Y2gm0+XgHRtk42fjs= X-Google-Smtp-Source: ABdhPJxNK/0FxWG6UWtbDGqepu2J+1snRHpqzutkikcHb4qtKTj4ZdaHApvpRwVdbSUZPF2UZtdXkQ== X-Received: by 2002:adf:eb02:: with SMTP id s2mr682041wrn.294.1630624888649; Thu, 02 Sep 2021 16:21:28 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id v21sm3249644wra.92.2021.09.02.16.21.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Sep 2021 16:21:28 -0700 (PDT) In-Reply-To: <87o89avba8.fsf@gmail.com> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=raaahh@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-2.225, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273735 Archived-At: On 03.09.2021 01:54, Matthias Meulien wrote: > I tried to write a test for with vc-version-diff to start with something > that looks easier to me. (Almost copy-pasta I'm afraid of.) > > I installed RCS, CVS, SVN, Git, Bzr. Unfortunately the test fails with > the first two; Still no idea why... > > Since it's the first time I use ERT and before I spend more time > investigating, can you confirm it's the kind of test you had in mind? Yes, very good. Thank you. I don't have either of RCS/CVS installed, and have very little real experience with either as well. We can wait a few days for somebody to chime in with a fix, or failing that, commit this version (maybe someone else would like to contribute a fix upon seeing a test failure). We can also disable the test on those VCS, of course (adding an (or ...) to the skip-unless form near the end of the patch).