From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Matthias Meulien Newsgroups: gmane.emacs.devel Subject: Re: Is vc-diff-mergebase broken on master? Date: Sat, 04 Sep 2021 21:33:06 +0200 Message-ID: <87r1e49lvx.fsf@gmail.com> References: <87a6kyacqn.fsf@gmail.com> <89f53c5f-3936-bfb1-eb47-11c9a6bd8e5c@yandex.ru> <87o89avba8.fsf@gmail.com> <7b6753e7-1bde-4a1c-e0b3-02a63adec84c@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4253"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Sep 04 21:33:52 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 1mMbQG-0000uW-GQ for ged-emacs-devel@m.gmane-mx.org; Sat, 04 Sep 2021 21:33:52 +0200 Original-Received: from localhost ([::1]:40256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMbQF-0003bK-G9 for ged-emacs-devel@m.gmane-mx.org; Sat, 04 Sep 2021 15:33:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMbPe-0002ml-Os for emacs-devel@gnu.org; Sat, 04 Sep 2021 15:33:14 -0400 Original-Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:41626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMbPd-0003JU-69 for emacs-devel@gnu.org; Sat, 04 Sep 2021 15:33:14 -0400 Original-Received: by mail-wm1-x335.google.com with SMTP id u15-20020a05600c19cf00b002f6445b8f55so1912469wmq.0 for ; Sat, 04 Sep 2021 12:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=BDiFkYcR840A4AqRRSqHonSVniwz2d4Y74T6FUJ08Rw=; b=V8ti4otKTqqgFP2XepLrhS5UUyqgAu7fCfnI4FcJI74lJnni1IUDcDctsn3pCbGz4b hHgRcZj3BV3t7CbGzVrti17JakaMM8suaI3TCfKPL7kNalMdBFqnIBZFHK3JtuyHAiCT JU9iTiGlHv45NIfDCTTOkVlM5GMtt3b90VJtoodeO2UVtlZ+qWW5WJC5V0hCtZJRlUte 3TLQSUmYrfyhJwExMpt/GIHbTF+08IeKpBNbjAkwL9WAQ/gKqma1j86uKD9nutqhdHwy JkwTvBrzvxr62EsLtgugRxq9xveVZvpJY/4CSgpIEVpScDdXnwVrDY9B8kPuHbRCuy/2 7BcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=BDiFkYcR840A4AqRRSqHonSVniwz2d4Y74T6FUJ08Rw=; b=ngBHgb5Iq2WFP6NuyC8OjpnCHl1DCPfmtbIuWS8ty6j6rKlunDcFSs7bioRulSO8PI WD73qSTOmqv4tN9npdc2hstZRkh4eS5Z+5uGEpwNVyPjTDJJJCEY0D3JZcIH3RZHM+Az BrqK23aYDrgO3wksEz8LEW/Roy6MoxZ9/vFC1CyDOFvKUO3JcSoXSB5SyvKjiOi0vV9f N1I1IR7Ygq0Yrkx/0dZLHRXEYfzCDcjiggFCll4MmKv2zGXiyQu6aioQfzdfkmrVSkT2 Pq8HAo9jSQuJohK1HwJJ+whFqODeNH/U9byRcWH3nbxstCOOSTwq74OPcUaYORIVrWaZ MNDg== X-Gm-Message-State: AOAM532qLtOKp8J49KobvR8ep2IeTu2ZGZDlxwPj4P1z2M5baabjAcyW HacFc9SecNY0+22eo0xRKk41oO0Q9kE= X-Google-Smtp-Source: ABdhPJy2FHW4spMbxarjXjsYB7dF9pXTRjdzxOIotNGQMp4rjYhQ4TP7cPTHTdJFNveuK0Hj6aulaw== X-Received: by 2002:a1c:7e12:: with SMTP id z18mr4448700wmc.60.1630783991165; Sat, 04 Sep 2021 12:33:11 -0700 (PDT) Original-Received: from carbon.localdomain ([2a01:e0a:245:c850:98f5:429a:aa8e:95bb]) by smtp.gmail.com with ESMTPSA id y23sm2834669wmq.30.2021.09.04.12.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Sep 2021 12:33:10 -0700 (PDT) In-Reply-To: <7b6753e7-1bde-4a1c-e0b3-02a63adec84c@yandex.ru> (Dmitry Gutov's message of "Fri, 3 Sep 2021 02:21:26 +0300") Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=orontee@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 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:273955 Archived-At: Dmitry Gutov writes: > 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). Don't waste time with this. I've learned to execute tests step by step and now see meaningfull errors. For example, RCS expects files to be locked before checkin. I'll work on an updated patch fixing RCS/CVS tests. -- Matthias