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: Sun, 5 Sep 2021 02:50:55 +0300 Message-ID: <67ec71ec-e0bc-a5e0-3ea2-e7a10101affd@yandex.ru> References: <87a6kyacqn.fsf@gmail.com> <89f53c5f-3936-bfb1-eb47-11c9a6bd8e5c@yandex.ru> <87o89avba8.fsf@gmail.com> <7b6753e7-1bde-4a1c-e0b3-02a63adec84c@yandex.ru> <87r1e49lvx.fsf@gmail.com> <87eea49jif.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="19639"; 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 Sun Sep 05 01:51:38 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 1mMfRh-0004yW-2V for ged-emacs-devel@m.gmane-mx.org; Sun, 05 Sep 2021 01:51:37 +0200 Original-Received: from localhost ([::1]:45986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMfRf-0004Gc-L6 for ged-emacs-devel@m.gmane-mx.org; Sat, 04 Sep 2021 19:51:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMfR8-0003ay-LB for emacs-devel@gnu.org; Sat, 04 Sep 2021 19:51:02 -0400 Original-Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMfR6-000443-Pk for emacs-devel@gnu.org; Sat, 04 Sep 2021 19:51:02 -0400 Original-Received: by mail-wr1-x435.google.com with SMTP id b10so4103886wru.0 for ; Sat, 04 Sep 2021 16:50:59 -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=D4HPLyJG/wZ98KPT5qwhiY23wqTTU+fk//QSi9Klk2c=; b=PgRLqTOXiCCpeGuFwJjP8BU9YvnCosJouxa/lkWTpfljJkoKaS9CbPnltXJJ570+r3 Ck36Fkx2I9z1sQUT/QV7CVt71HuGYJwh6KRMvEDkAGaWdntfQp14nRalPd+LJhyDuDng XqK5rSszwot5AdQtIOZNxE+UIBTHfk7UrwMn13utazPtMa6J2rjTbiEkuUQkIC/tpSce /V9HjvVrVlAeqqHRn61UfUBh+MxdxIIvFw6nxVi3GvF3KdNXfcYPQnigmrS8455GckUd Q4Z++E7c4wgBYuIg1ST1z7BUhnXDjUQYEPrnCFIIACmHgp2W9ErGuvVdje9o7iDLCO9G 4s6A== 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=D4HPLyJG/wZ98KPT5qwhiY23wqTTU+fk//QSi9Klk2c=; b=q8qAnDyR8Oa98ErFEyvcGrgkNhtZhDCT8N67j+IuhiVomX4MaL0ijACldVMJStb5KN 3qmcTYRxPu+VKny1dcnoM6rzAOHID0MbJXNeTA5PbF5t6vA79Br+6UG63p691+cByTkd JNy+fsBzcc7CvXVvXL5pP4X80hXBxBpQPj8NYE8Jm0liQHdiJ4rDRgU/G9Vrw4XGoV67 rVCURMxOIjpNZM0Qfqo/d9M3zwqkYZMe5xf4/uV53PGv5BQCd9H1C+5ekxPebXylw4QT VDLaFV4Jvd/rwaJUGb4h+E4ucnezKEVPxAR6S2sqZZCQAJsSPQBMlORTdYJUJDTobQ7F 28uQ== X-Gm-Message-State: AOAM531WCYinaWnX+Ek+oUrsWPfEPslpwiwT8SAnTVI1pHrfvBDDXNpT Rh3DilxhTZnoWVTcNb7g72KLV73d3Tk= X-Google-Smtp-Source: ABdhPJwQobGMEWxrG3GFb/u8238/woUAWDMKrJruwmT+/fR5Cx79RYedeVsseeuMpo8uz6wQFSO06g== X-Received: by 2002:adf:d187:: with SMTP id v7mr5884089wrc.186.1630799458122; Sat, 04 Sep 2021 16:50:58 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id u17sm3081002wmm.33.2021.09.04.16.50.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Sep 2021 16:50:57 -0700 (PDT) In-Reply-To: <87eea49jif.fsf@gmail.com> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=raaahh@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -52 X-Spam_score: -5.3 X-Spam_bar: ----- X-Spam_report: (-5.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-3.832, 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:273972 Archived-At: On 04.09.2021 23:24, Matthias Meulien wrote: > Matthias Meulien writes: > >> (...) I'll work on an updated patch fixing RCS/CVS tests. > Here it is: > Thanks! Applied and pushed with some tweaks: - Moved the function below vc-test--rename-file to mirror the order of tests. - Some annotations (declare-function, backend action coverage at the top). - Untabified the added lines: if you can, try to edit the files in the repository checkout, or customize indent-tabs-mode to nil globally. We have it set in the repository's .dir-locals.el. The rule is we don't mass-untabify existing code, but we try to obey the current setting when changing code or adding new lines.