Received: (at 3860) by debbugs.gnu.org; 1 Apr 2025 17:17:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 01 13:17:56 2025 Received: from localhost ([127.0.0.1]:50850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tzfFI-0004b8-Bu for submit <at> debbugs.gnu.org; Tue, 01 Apr 2025 13:17:56 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:58765) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1tzfFE-0004Zz-PL for 3860 <at> debbugs.gnu.org; Tue, 01 Apr 2025 13:17:50 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-22409077c06so156390045ad.1 for <3860 <at> debbugs.gnu.org>; Tue, 01 Apr 2025 10:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743527862; x=1744132662; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=sZF23tD6yjkXB1Tg9FFih3xjzvAjK7+HsuS+jwE81FI=; b=IQGmU4so0HxQwB0o+r38sv2NWNSWSnHo47uL2fYHBADcZiUyWFFGzWCPRAHb9+xU21 PSoAJu+27rlkGDCm2WMqEl56pKMm/cYg852MU1seIJ0Q2a3Lz0UZhY8mDszuLdL1cZIT xl+HnA8ekZq/gesJ52//JrQkVTmbLv78ZM4fLa4jLq1olrwYZUSWqoQXyJNjHsdFFxW4 GJAHmpnN3jdCMQjQvCZCFJI9v/IFZc4c1j7WSie5e0hEAaNNMcmkGI+U08nqhNO0hCyi p9Fhi68Y9iJ01UTChEsgOav6qKvNIZAUka4D00kAeLujXnZDFXi+SKXXX6tieP+j9vC9 cKnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743527862; x=1744132662; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sZF23tD6yjkXB1Tg9FFih3xjzvAjK7+HsuS+jwE81FI=; b=h7V+cJrO3uUdp//TyHNI8qw+fvDveDi06D8cVO7hEcKkwfQcglBYMtnHgFEaVppxBK 5B3LdrxvtYKv0Cgn+lgxWEEyhXMUGXyXVN/7BJLtYXTQaB+djIfxPImryzovTWUBVwBv KPqkmq4dxCuBFysJc02/BEWU4WH5Mmi6zDI0au6SBpKNnoaJGYHftdqQF7GMEt3AKIGg ImxHHx3+aTJ6k47VonkgtzxBCCPEYOxPGrS2b1W30FxpcG+Jp04XsPLnxYsdqsWKGRNM xS413S1xbcm58OPLizu0lnT9isdPWKDsmL+QPFY4U2x244x7HUXYuh9rDnmn67uZjg5G yzvQ== X-Gm-Message-State: AOJu0YwijhBIZp2XDOjKMFoZSe60rJG1dLAB+iVvv/xqRxS68oiHa2dg 3dm0/U+q35xlE8jBLnuLdmZwiPtPYHhrvLbgmInzTyKfgM4S57Ng X-Gm-Gg: ASbGncvrEQCkqE3l1eT8lFd/VVGZR7iFbYIyF1wKOXITM5ANic3YG4jBoYqYdlY1iFX f3ql21giEvxFxflzm3ojKHkrpCHvKcQ36eC4xUwrlQe1pIWq6kjauZ6AfwYEHnu/2AZNQHkZX1t SGUfCx5B9PCHPp7oAfkxDBC0ALdGIxJNgSMgmZt/8tStgR0T/s7Ek3VkUm8zumZNrt8EYAJIKQJ db78SxeXXqMk1NUxaK8m96rUSA+YRTgSwqQUYdBRm5LxrGAdm0NVCqfbgh48wQ7gswfYFb0D5fR jgKPDRBgrCI9xhSl7c34BTVecBsNUm+SnEiPm/eJ28ysx2oeGbQ= X-Google-Smtp-Source: AGHT+IEOmfiARtV+lx8R2RxQyv0whlV1Hjfbzm0Xj1DfZkoQtM6XHFt+0tGRpPpal8cmNT48yOHy3A== X-Received: by 2002:a05:6a00:21ce:b0:736:a8db:93b4 with SMTP id d2e1a72fcca58-7398033f161mr18468709b3a.2.1743527862318; Tue, 01 Apr 2025 10:17:42 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7397106c06asm9459216b3a.107.2025.04.01.10.17.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Apr 2025 10:17:41 -0700 (PDT) Message-ID: <04054c88-2feb-4f8d-b2d6-b3e3d3fd4801@HIDDEN> Date: Tue, 1 Apr 2025 14:17:37 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: Eli Zaretskii <eliz@HIDDEN>, Stefan Monnier <monnier@HIDDEN> References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> <9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN> <861puf7tiz.fsf@HIDDEN> <jwv7c45uotl.fsf-monnier+emacs@HIDDEN> <86v7ro2l9m.fsf@HIDDEN> Content-Language: en-US From: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <86v7ro2l9m.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, spwhitton@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 1/4/25 08:07, Eli Zaretskii wrote: >> From: Stefan Monnier <monnier@HIDDEN> >> Cc: Mauro Aranda <maurooaranda@HIDDEN>, 3860 <at> debbugs.gnu.org, >> larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN, >> spwhitton@HIDDEN >> Date: Mon, 31 Mar 2025 12:51:23 -0400 >> >>> vc-hooks is preloaded, so perhaps moving the variable there is the >>> best option. >> >> Sounds fine to me, yes. > > Thanks. > > Mauro, would you please move the variable to vc-hooks.el? Thanks, done.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 1 Apr 2025 11:08:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 01 07:08:03 2025 Received: from localhost ([127.0.0.1]:46683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tzZTN-00021v-6G for submit <at> debbugs.gnu.org; Tue, 01 Apr 2025 07:08:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41696) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1tzZTI-00020A-4H for 3860 <at> debbugs.gnu.org; Tue, 01 Apr 2025 07:07:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1tzZTA-0002Yo-Ig; Tue, 01 Apr 2025 07:07:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=e7X6T18ZReHi1wl5Iai12rH/L+oLf0V7/XTYVBLxEYM=; b=XiYocHH+CPXN Cs7O6VNAtJ4LcuQLAcH6xvnaizYx0uISNZJUzADkpIbkNWGmU8Cu4oOruuk0L8sHjeJY22dU7XvS7 pmQ/1Uicrid01lS2jrq0Nr0+ufnIOjwxc7nlQhNeV3Y4gQZ7V94kUvstCyNFYJ3gwhN/ef62zzTAo 3ADrNeoG/0YWVKADn7xgTTqJOdsLwxycC6123C/23Ru6+6fhsObaRBvv83f5dF7BA8alWKfnVoPv9 4PFkRTUkMmZ2bjxeHfRKwEh1Ka3LTSWWsqrpK5C3PfAuhL4Oit8MLLibUBU5XKnO1N+vFQNhZvGhT 5nn6qa9GjJ2XbOyK526/Pg==; Date: Tue, 01 Apr 2025 14:07:01 +0300 Message-Id: <86v7ro2l9m.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Stefan Monnier <monnier@HIDDEN> In-Reply-To: <jwv7c45uotl.fsf-monnier+emacs@HIDDEN> (message from Stefan Monnier on Mon, 31 Mar 2025 12:51:23 -0400) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> <9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN> <861puf7tiz.fsf@HIDDEN> <jwv7c45uotl.fsf-monnier+emacs@HIDDEN> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, maurooaranda@HIDDEN, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, spwhitton@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > From: Stefan Monnier <monnier@HIDDEN> > Cc: Mauro Aranda <maurooaranda@HIDDEN>, 3860 <at> debbugs.gnu.org, > larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN, > spwhitton@HIDDEN > Date: Mon, 31 Mar 2025 12:51:23 -0400 > > > vc-hooks is preloaded, so perhaps moving the variable there is the > > best option. > > Sounds fine to me, yes. Thanks. Mauro, would you please move the variable to vc-hooks.el?
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.
Received: (at 3860) by debbugs.gnu.org; 31 Mar 2025 16:51:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 31 12:51:35 2025
Received: from localhost ([127.0.0.1]:42644 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tzIMJ-00070E-3D
for submit <at> debbugs.gnu.org; Mon, 31 Mar 2025 12:51:35 -0400
Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:63006)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <monnier@HIDDEN>)
id 1tzIMG-0006zI-G0
for 3860 <at> debbugs.gnu.org; Mon, 31 Mar 2025 12:51:32 -0400
Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id C3AC11000DF;
Mon, 31 Mar 2025 12:51:25 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca;
s=mail; t=1743439885;
bh=AUEE1zOGsYLjsqEngMnFOvIoPsu4FgoD3oxVdRJ4JgE=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=djF1tpNtJkLN3/I5r8yrNfqKe0/KRzgG0dKcPmdTuh6bNOHEhFeJeO5TvRL6wbs3P
hi8hMawSyx2887EtraS5T+ocpU8EozDxV1nLTVQ2rgFapaD5RB6iHAdMJ/TuOmb18k
JUb5nkDWWxHrCry4GvvC/rS2TkL69Vt4q/yeUEXKA0TaVZwC91SA8ycW/tC0bBqBZu
YvusFqgDllsCcA0Uyo5jAzzotj2fAPoNxeVimE4JqSZzgspgqQvcri3zZpo8RqfrZQ
SrEEgChZdV0TkZ0EpzSChRM1ZGE8dN6kL3Khl/yMkJ8I9qzpOzQHf4zZ5Xy3UekTNq
yDBvRHescVjxw==
Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 334C5100040;
Mon, 31 Mar 2025 12:51:25 -0400 (EDT)
Received: from alfajor (unknown [23.233.149.155])
by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 015FC120426;
Mon, 31 Mar 2025 12:51:24 -0400 (EDT)
From: Stefan Monnier <monnier@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission
In-Reply-To: <861puf7tiz.fsf@HIDDEN>
Message-ID: <jwv7c45uotl.fsf-monnier+emacs@HIDDEN>
References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN>
<86y0x90yvz.fsf@HIDDEN>
<18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN>
<86pliiwkxx.fsf@HIDDEN>
<99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN>
<868qoo6jhz.fsf@HIDDEN>
<9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN>
<861puf7tiz.fsf@HIDDEN>
Date: Mon, 31 Mar 2025 12:51:23 -0400
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-SPAM-INFO: Spam detection results: 0
ALL_TRUSTED -1 Passed through trusted hosts only via SMTP
AWL -0.284 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature,
not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's
domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from
domain
X-SPAM-LEVEL:
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 3860
Cc: jknight@HIDDEN, Mauro Aranda <maurooaranda@HIDDEN>, spiegel@HIDDEN,
3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN,
spwhitton@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> vc-hooks is preloaded, so perhaps moving the variable there is the
> best option.
Sounds fine to me, yes.
Stefan
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 30 Mar 2025 05:27:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 30 01:27:57 2025 Received: from localhost ([127.0.0.1]:34065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tylDB-0003Ym-9K for submit <at> debbugs.gnu.org; Sun, 30 Mar 2025 01:27:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35650) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1tylD8-0003YR-D0 for 3860 <at> debbugs.gnu.org; Sun, 30 Mar 2025 01:27:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1tylD1-0007Sk-Jz; Sun, 30 Mar 2025 01:27:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=595CxzbixbEOBKO34+o0M3dU/CyGacOOBej+KsAskqk=; b=YO2DodDu6sg+ TuuAaBP4iZGj4vRsQ9BrqK8NrgneSd6vCPkBxSXRfTr+1F5at+mvA2w4HmMguuvzVLhy9UtCt6440 vbokyr5VMKN5HxWBUxaB3RWxdzfyDYVWlZ0ynTGgsjOTCY2v71QrhV/kRWrxZIaVVJXQG91k87POX TPurj0EvrvnZ6v8o9HagyNcSSQHV8mEQRJiZDwdZtDSm0PpkfTBuWhVx2gWG//80XU+qQW6Ucddmi lG9ObWYxR6tLH7snKvvpjkJcZrmAIL2QImUnxf6UHViI64uh7jPiavcb9TZOB7cE2zNyPydNIgB+N IHfy0Ok453t+qLBDvhfNsQ==; Date: Sun, 30 Mar 2025 08:27:43 +0300 Message-Id: <86o6xj5bqo.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Sean Whitton <spwhitton@HIDDEN> In-Reply-To: <87zfh31duz.fsf@HIDDEN> (message from Sean Whitton on Sun, 30 Mar 2025 09:55:32 +0800) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> <87zfh31duz.fsf@HIDDEN> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, maurooaranda@HIDDEN, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > From: Sean Whitton <spwhitton@HIDDEN> > Cc: Mauro Aranda <maurooaranda@HIDDEN>, 3860 <at> debbugs.gnu.org, > larsi@HIDDEN, spiegel@HIDDEN, jknight@HIDDEN, dgutov@HIDDEN > Date: Sun, 30 Mar 2025 09:55:32 +0800 > > Hello, > > On Sat 29 Mar 2025 at 04:42pm +03, Eli Zaretskii wrote: > > > The various vc-FOO.el files only 'require' vc when compiling, which > > doesn't solve the run-time problem. > > Do you know why this is? The obvious thing is for them to all require > vc but it seems likely there is some specific reason they don't. It might be that the stuff we need to always be available should be in vc-hooks.el instead, which is preloaded.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 30 Mar 2025 01:55:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 29 21:55:44 2025 Received: from localhost ([127.0.0.1]:33694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tyhtn-00015t-PR for submit <at> debbugs.gnu.org; Sat, 29 Mar 2025 21:55:44 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:45064) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <spwhitton@HIDDEN>) id 1tyhtl-00015f-Pb for 3860 <at> debbugs.gnu.org; Sat, 29 Mar 2025 21:55:42 -0400 DKIM-Signature: a=rsa-sha256; b=WWcvKvn4TDWFqjNSN/9uNXIHnfAdryScRPiZAEYrVB7pq6ydr5DVLEvEtBbbBPy9Sspj5cdp9kH9VHr7LFc3CnglrJpttmfu5UM39eUYZpdEnT6A31zdpdyaO2rccZud05HH28trCCP01a9HTy187ce+ZQ9k+k/cR59cX9eEYbXN0glanKRiMUzl1k9tSI39qTBrj7NDgFNAewS3jB0FMFJ1/EytrqdxwPZ7wBDrlfX7tGjcrTKV0KYf1ChC6vtsjUPiKEL2gMajwG9v7RubjW6Uem8hc9VUbH1ZOqzXQbVWc+X/0OPBTbvazJ4sXA9AfCazpHdFiocWnzsv0cOZPg==; s=purelymail3; d=spwhitton.name; v=1; bh=ztOK/d935hD6yXyQ03PrhFUBdg+T356XBMpum3W30sg=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=e2PU7fes5H5jUaSJEROfikxybJWgb6d9Ho/jQw872l/DjilmG/+xhtzd1PnKNEmuWeXgjw9L1kpWHWjw/t6+dHytLtQnNbT2Q6B5s2e5z76z7axAvZxbxNbDeX0YCw424Y8THPa2TP7Zk5NQ5GGlGrZHYU5q9oFttIx35USd19C7TMDJg6bt4D6RSnBzNC47IQyvANtJeuNVAf5ESDqfwPX7HXkgMQxI7Lk3UnrZno0/Y93wioNPsRPLsIDYWXkoAbBPvx06OGwlQW6/X82DJAQgTCAP4nZp1+OklwoX+BFa37K0ijs596omwU8Z6IkuZcTSpE2srChZbe7DK2aVcw==; s=purelymail3; d=purelymail.com; v=1; bh=ztOK/d935hD6yXyQ03PrhFUBdg+T356XBMpum3W30sg=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 3860 <at> debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1236005117; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 30 Mar 2025 01:55:35 +0000 (UTC) Received: by melete.silentflame.com (Postfix, from userid 1000) id CB5847E8441; Sun, 30 Mar 2025 09:55:32 +0800 (CST) From: Sean Whitton <spwhitton@HIDDEN> To: Eli Zaretskii <eliz@HIDDEN> Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission In-Reply-To: <868qoo6jhz.fsf@HIDDEN> References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> Date: Sun, 30 Mar 2025 09:55:32 +0800 Message-ID: <87zfh31duz.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, Mauro Aranda <maurooaranda@HIDDEN>, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello, On Sat 29 Mar 2025 at 04:42pm +03, Eli Zaretskii wrote: > The various vc-FOO.el files only 'require' vc when compiling, which > doesn't solve the run-time problem. Do you know why this is? The obvious thing is for them to all require vc but it seems likely there is some specific reason they don't. -- Sean Whitton
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 29 Mar 2025 15:20:54 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 29 11:20:54 2025 Received: from localhost ([127.0.0.1]:60831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tyXzS-0001yv-9D for submit <at> debbugs.gnu.org; Sat, 29 Mar 2025 11:20:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59892) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1tyXzM-0001yc-79 for 3860 <at> debbugs.gnu.org; Sat, 29 Mar 2025 11:20:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1tyXzF-0000zY-7r; Sat, 29 Mar 2025 11:20:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=YMGnsIhNdfISNIw7NO0rf6Ot2tJSzP8ryY/pkTSgbgA=; b=DlspQqSygdX44NG9GXt3 TWe/rkSUpOPf6Kw5kTUNA8uKV/F0t9O9rLVY0tBYqkbJhu+u1hg7+DjwE5AK36gxg0qZUTmP+PJP/ AQYCARzfHNQd0FSVab4udDX3fqhYpOrCZqaU1Qzlp68lOyqRuWLekvcs+8Ah9kawY3w175CS7ESyn uep++/kBo7/xExgQAy4mn1Vhx8TadgM62h0PPiNn1y/lv2bFwpTxrGD8mObMDEY3VTzHJHEH9xpDk 7zE87esonQthcCDJHtG5GLIQUpqMKAOOvE2jKJMgFKvKpmRgpdTV95MLa8XvaEwcyhI3DqYJ+yLZg ZHDDTWlspwKt8A==; Date: Sat, 29 Mar 2025 18:20:36 +0300 Message-Id: <861puf7tiz.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Mauro Aranda <maurooaranda@HIDDEN>, Stefan Monnier <monnier@HIDDEN> In-Reply-To: <9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN> (message from Mauro Aranda on Sat, 29 Mar 2025 11:41:00 -0300) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> <9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, spwhitton@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Date: Sat, 29 Mar 2025 11:41:00 -0300 > Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, > dgutov@HIDDEN, Sean Whitton <spwhitton@HIDDEN> > From: Mauro Aranda <maurooaranda@HIDDEN> > > > void variable vc-resolve-conflicts > > > > In my case, the victim was admin/gitmerge.el, which only loads > > vc-git.el, > > Ouch. I mistakenly thought that this could work like the vc-*-switches > options, but now I see that, for example, vc-git.el autoloads > vc-switches. > > > The various vc-FOO.el files only 'require' vc when compiling, which > > doesn't solve the run-time problem. > > > > So we will need either to make vc-resolve-conflicts autoloaded (which > > is generally discouraged for defcustom's), or manually 'require' vc in > > the various functions that reference vc-resolve-conflicts. > > > > Are there any other solutions? > > I don't know. Can the defcustom be moved to another file where there > are "generic" vc options, and that it gets loaded at run-time? I see > some options in vc-hooks.el, but I don't know if (featurep 'vc-hooks) > evaluates to t in the case you encountered. vc-hooks is preloaded, so perhaps moving the variable there is the best option. Adding Stefan, in case he has better suggestions.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 29 Mar 2025 14:41:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 29 10:41:23 2025 Received: from localhost ([127.0.0.1]:60694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tyXNC-0005MI-C6 for submit <at> debbugs.gnu.org; Sat, 29 Mar 2025 10:41:22 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:51635) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1tyXN1-0005LL-2U for 3860 <at> debbugs.gnu.org; Sat, 29 Mar 2025 10:41:19 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-30332dfc821so4599631a91.3 for <3860 <at> debbugs.gnu.org>; Sat, 29 Mar 2025 07:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743259264; x=1743864064; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=faX6wfKW2rS08GxbWuMK94VG2zzkMHM2Con5cFw+MYw=; b=iCrMsx67rwASc555bPe2GTc+DoQaHsi16maKYsXrHsBdhZ8W6x8SqVPNYXOQ8BtosM Eowl3JO6ot3M0WOIvwHfNJcMOLwYf4TrypPA3/m4PyG5ZS10w4O7psvCMaF6ELTHnWyI bXkmHh+Ew9nbuggAFGKjdNDdRxjUu1vymRS12Mj0c9v7ZWPa5BUj9drxGL7JlLJ3GNHb TTCdysCOWm8UxTy2h3Q6zf3D6xxbZWtabHq2/wsWM736JOuq4+7gM1kVM37/Dy8TPk5V 3vmNrtUGzJ5ayIrdAQV9TQ7Sw+MmvvtCUJUoXex9kohOmpg8uz2Bveb9mWty13Z4BigC mOfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743259264; x=1743864064; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=faX6wfKW2rS08GxbWuMK94VG2zzkMHM2Con5cFw+MYw=; b=m9cagxsnfvoWkS8sow0w7pBm8ZFHZa5dgfLcA4ZWhKBwe5swCJ99SXtbEezYiGorSW Q5+3LoWvwgfpUscoWux4ztXwkfwV6kmlIFoo/Jth9IHoaTMiYVSZ09sFOAydnSUc8n7q R2V/xLG3Ow1p0yIxP1knZRndZAaJbPB7BEBG/EepaNm8fE8DRtcTHan5yos4lMRzGTuI vm+PAkywwm3i684jVjo19joC3D7t038KhTwUmChKLdk2qdIqcjVKLG8gG/aa2/J3NehA CSoNC4vMEqENvIO0cSf4a66gXw27+MUURB9kpn83T/Xq8NJAIi6EvP2gp98FQzk7janx RmWg== X-Gm-Message-State: AOJu0YyiMmU63f7WsPhVjxZzSX9lC5Kq2v8KNDpt1hsVME65p5TI21Cr 8e3GdUwsTXKmdGYvV/xhVUxFFVVM7HT/fPn2GAaq5XxGjbiAtc2G X-Gm-Gg: ASbGnctqLCyO+F+siduu8zO5S56G8OjQD5J9z47LXQdsMlTYWca6qOhcUDwu5CrgjCx rCbmZt+QSZGVB6P6eVZAPEzy8LrbZDKT7XV7n63BvMSj4FJ60sqNc/WDmGlSvdQtJckVOw65LU9 WIEpt7rnCQ/6vv2AbQhkthqzIchB1xLk3Tx1ZmKNrZMQLIsqkgcGjSFbaebYxuD4CqYDdjYLxwg qN9V3+yL5r3wdtjsRwdJ2OrLeExwhmceDWPg+3nGD/jbqcQN73WBhgVGukggVcoqC6kgcDjLJKo dQlnJG0YZT69lT4kR6oKCsM+Lmox7CfouTYhHok56vBppBdYyxA= X-Google-Smtp-Source: AGHT+IHJ/hmE/qKmXJUngfJwPV6GG0Bv/ll28vGVEgDZ0lrj1uCUvB/oo+zQZ0HuexrRa2kq+MwROg== X-Received: by 2002:a17:90b:164d:b0:2fe:a336:fe63 with SMTP id 98e67ed59e1d1-3053215d8a3mr5316768a91.24.1743259264429; Sat, 29 Mar 2025 07:41:04 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-305175cae19sm3785418a91.43.2025.03.29.07.41.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Mar 2025 07:41:04 -0700 (PDT) Message-ID: <9d89f5e9-360b-4c8b-93b3-e85de84fa9cd@HIDDEN> Date: Sat, 29 Mar 2025 11:41:00 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: Eli Zaretskii <eliz@HIDDEN> References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> <868qoo6jhz.fsf@HIDDEN> Content-Language: en-US From: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <868qoo6jhz.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, spiegel@HIDDEN, 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, Sean Whitton <spwhitton@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 29/3/25 10:42, Eli Zaretskii wrote: >> Date: Mon, 17 Mar 2025 06:57:54 -0300 >> From: Mauro Aranda <maurooaranda@HIDDEN> >> Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, >> dgutov@HIDDEN >> >> On 15/3/25 09:13, Eli Zaretskii wrote: >> >> Date: Thu, 13 Mar 2025 12:11:21 -0300 >> >> Cc: 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, >> spiegel@HIDDEN, >> >> jknight@HIDDEN >> >> From: Mauro Aranda <maurooaranda@HIDDEN> >> >> >> >> Thanks. Revised patch attached. >> > >> > Thanks, this LGTM. >> >> Thanks. Installed on master, and closing the bug. > > I've just been bitten by this change. Its effect is that any package > that loads or 'require's vc-SOMETHING, without also loading 'vc', will > likely signal an error: > > void variable vc-resolve-conflicts > > In my case, the victim was admin/gitmerge.el, which only loads > vc-git.el, Ouch. I mistakenly thought that this could work like the vc-*-switches options, but now I see that, for example, vc-git.el autoloads vc-switches. > The various vc-FOO.el files only 'require' vc when compiling, which > doesn't solve the run-time problem. > > So we will need either to make vc-resolve-conflicts autoloaded (which > is generally discouraged for defcustom's), or manually 'require' vc in > the various functions that reference vc-resolve-conflicts. > > Are there any other solutions? I don't know. Can the defcustom be moved to another file where there are "generic" vc options, and that it gets loaded at run-time? I see some options in vc-hooks.el, but I don't know if (featurep 'vc-hooks) evaluates to t in the case you encountered.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 29 Mar 2025 13:42:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 29 09:42:53 2025 Received: from localhost ([127.0.0.1]:57548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tyWSa-0001fL-PU for submit <at> debbugs.gnu.org; Sat, 29 Mar 2025 09:42:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35900) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1tyWSV-0001f1-QD for 3860 <at> debbugs.gnu.org; Sat, 29 Mar 2025 09:42:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1tyWSO-0003VO-JC; Sat, 29 Mar 2025 09:42:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=DDLGmknofFf+0cAxx4cIddOXsYAsN+b0GV/X6ZtnJUQ=; b=RTW1/x7W+O4igVBXbS4G 1emOlzbeK8aIxoo/22bPb8vBYslixhmxzaIlChSh4KibdWClpAzJ2sqAIMOb6r5kbDSKH/Pg0vsgF hyezMiFJulo4JxJqdPrK62igbMiHOvFxek/qraMharwJSJltSij6xEKBHfdCBsrpj/MoPxFtQoHc3 F3zBx7JciV2TCUjUl32eGx00hGV6YZnIswjAjnS4F/ZMb7C1JeCCQpcYDKqnS5/aV0JjsnHO677tR cGWvG5zTYh7aenRebHpaVchtYZDe+T6MhOVcRPAHkBwKNJi+IJH7VIAM9h7oAXoBa+C+CR3QrkVQQ yS550hcjyoGisQ==; Date: Sat, 29 Mar 2025 16:42:32 +0300 Message-Id: <868qoo6jhz.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Mauro Aranda <maurooaranda@HIDDEN>, Sean Whitton <spwhitton@HIDDEN> In-Reply-To: <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> (message from Mauro Aranda on Mon, 17 Mar 2025 06:57:54 -0300) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, spiegel@HIDDEN, jknight@HIDDEN, dgutov@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Date: Mon, 17 Mar 2025 06:57:54 -0300 > From: Mauro Aranda <maurooaranda@HIDDEN> > Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, > dgutov@HIDDEN > > On 15/3/25 09:13, Eli Zaretskii wrote: > >> Date: Thu, 13 Mar 2025 12:11:21 -0300 > >> Cc: 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, > spiegel@HIDDEN, > >> jknight@HIDDEN > >> From: Mauro Aranda <maurooaranda@HIDDEN> > >> > >> Thanks. Revised patch attached. > > > > Thanks, this LGTM. > > Thanks. Installed on master, and closing the bug. I've just been bitten by this change. Its effect is that any package that loads or 'require's vc-SOMETHING, without also loading 'vc', will likely signal an error: void variable vc-resolve-conflicts In my case, the victim was admin/gitmerge.el, which only loads vc-git.el, The various vc-FOO.el files only 'require' vc when compiling, which doesn't solve the run-time problem. So we will need either to make vc-resolve-conflicts autoloaded (which is generally discouraged for defcustom's), or manually 'require' vc in the various functions that reference vc-resolve-conflicts. Are there any other solutions?
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Mauro Aranda <maurooaranda@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 3860) by debbugs.gnu.org; 17 Mar 2025 09:58:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 17 05:58:09 2025 Received: from localhost ([127.0.0.1]:55709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tu7EW-0005fl-7h for submit <at> debbugs.gnu.org; Mon, 17 Mar 2025 05:58:09 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:58402) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1tu7ET-0005dz-Dd; Mon, 17 Mar 2025 05:58:06 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2232aead377so90144105ad.0; Mon, 17 Mar 2025 02:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742205479; x=1742810279; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=JjenFKfgn8w3/moiI7s2bamb+y9d2fYtl8Ld5Vva2lI=; b=QsWQPZioUNrugIIV4O/BLwKEdGfjBSVo1GJrSoyA1NVWJgfe2gILBnHPRP1tesDYPA PjGJrclCNin5IYTkkbzP3ygVRhk7WgonAodi64+UfHpwEXlYt3Ncefi5nBzdGsOULTTr CcSgMJTxpWzFxzUJ1i9+ypf8dkgASKffJVTF/aumGuXr9QFWrmZzM/oEsdEk88E3LXBK u/mkw99p98ROZbOcbGp2Sz3MpmhrasJyTGrA2xwfPIWAQ4Z4c/H+j+SfXK0T+6mriCnk 9GlzaFL3qgwFJcLLfoyx2kgzahm5WgIpUOl6pm4LtO3cYe96iyvqBd0BSEBK6Eh4oMCL scuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742205479; x=1742810279; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JjenFKfgn8w3/moiI7s2bamb+y9d2fYtl8Ld5Vva2lI=; b=pw11tt4pAS6CZA/3BfYDXLsMQMifRIFuvUSbrRq6Kw0dQ4mQWUJ+PTWIIi3cY7n35j MkR3cXP+mYrctT83y+Vgu7YZp51I3tX7fjv1LDoCBH75AzuRdDkqDV46A9KL3NWTM/aK 6Bk+VAV/8ggJn2FocUYRk8/rY8BXkABWVaZFMYXOIDqgKdbShfgoNBeQGeCvwvM261Gy TAKktM2KjtMg55+YoM4rE48LWEqwWEDCvNOaMr4P2XvbMfTHlvLE9Yumf7gEKcq8ECZP TYHzz9L9WRuMBWJ6rMbVnxWVcHKJqJHKkmDtK0jRC8NlRVRufyyIJoaz6y2ZmGpHdBZj FejA== X-Forwarded-Encrypted: i=1; AJvYcCUHp4nkmNUc4o0rsHG9Z36zlUZqELZzkZcXqyYLmFviCWbB4VjPSs/o48FQkUnNv1Y0dQGlvTBS <at> debbugs.gnu.org X-Gm-Message-State: AOJu0Yz0fiZ0XjQcz2zqx8YX2+R71lPveV9IKt4WJuyCHPRsGHHA0Htq 5nfr0IovMU3cKnKkQz9GE6y48noPjUdbMhOdRfVRQ812YcjFU0zy X-Gm-Gg: ASbGnctahlKg07gRTd8cwGovCl+s/iHg5qhCWeTu2ACTNqdmcJCrqzvrz1ZBjEJInxr +zzPstnen5wmknMXo1SIw1jEUSRn4DAannJ8JEPnkERwXWSb+g4pLWaoNsjiWtAWbgMc+rm7R4L wLHhrUY96U9Xm04CcdF3HDFnIfEy1vBMsmXuy1YWlbD4tmRrZRcbCPTh//hrwRuR2jj1ejjSQBo AU8XpgKPr16VYxGUDRw/GCIG0I5YmU0V2M30nRRNrRjKKJSNzU9js70sw1W7KzIIK5tyOWQ8DAJ AHXnzEPQeaka2hmJKpZiTiPsZSV87A4cnCQF9TWg8KJDRfTaNcI= X-Google-Smtp-Source: AGHT+IG10BbAjZelKXPtOsqq4zoLsXAd8h3cZTpZWScnzoxBsSErmAoMc9hEFazGs5N/8agFWGHiqg== X-Received: by 2002:a17:90b:1807:b0:2ff:6fc3:79c3 with SMTP id 98e67ed59e1d1-30151cd5f8dmr16197369a91.9.1742205479033; Mon, 17 Mar 2025 02:57:59 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3015353462asm5619268a91.27.2025.03.17.02.57.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Mar 2025 02:57:58 -0700 (PDT) Message-ID: <99c1799d-f087-4833-9c8f-291ad74730d0@HIDDEN> Date: Mon, 17 Mar 2025 06:57:54 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: Eli Zaretskii <eliz@HIDDEN> References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> <86pliiwkxx.fsf@HIDDEN> Content-Language: en-US From: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <86pliiwkxx.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) close 3860 31.1 quit On 15/3/25 09:13, Eli Zaretskii wrote: >> Date: Thu, 13 Mar 2025 12:11:21 -0300 >> Cc: 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, spiegel@HIDDEN, >> jknight@HIDDEN >> From: Mauro Aranda <maurooaranda@HIDDEN> >> >> Thanks. Revised patch attached. > > Thanks, this LGTM. Thanks. Installed on master, and closing the bug.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 15 Mar 2025 12:14:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 15 08:14:08 2025 Received: from localhost ([127.0.0.1]:39528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ttQP2-0000WF-1r for submit <at> debbugs.gnu.org; Sat, 15 Mar 2025 08:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50656) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1ttQOz-0000UO-T8 for 3860 <at> debbugs.gnu.org; Sat, 15 Mar 2025 08:14:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1ttQOr-00066a-Pt; Sat, 15 Mar 2025 08:13:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=uYEM9h1qQh0Ze64i/QSOI5jim0U1KLpVjyz6l59fnoY=; b=oNlvN8PZH3ydW1k06Em7 vvIJDIeV3FgCYS6JSPutaD2lyRIzPQYA1orv+gBeaayxZYSE4qyXw4gQJAoi9SDKl7fWAMqVsFWwd tK3EKcHSkpRzDJGVRLbqpIBxsNMJkZcrTxdNGCrk2WqMsVTMYjQO/m3i/WElArgzRlPziMYNFLbgz XVOZUtzciItnn8TdDSPuM4aSAGjEnFHaDHwx4zaQyVu/9iH3cTxMWUxmCt0wqL0IHNdE5yS+iaQ9N qNk+2Q7K2+SXBl6H58s+4KHm+JmqCfoKkTaLKxoY2uoRIAt6rk019msJE3PUIZEq8q505Vu8UqUbg HUCNB9qxylWNjA==; Date: Sat, 15 Mar 2025 14:13:46 +0200 Message-Id: <86pliiwkxx.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> (message from Mauro Aranda on Thu, 13 Mar 2025 12:11:21 -0300) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Date: Thu, 13 Mar 2025 12:11:21 -0300 > Cc: 3860 <at> debbugs.gnu.org, dgutov@HIDDEN, larsi@HIDDEN, spiegel@HIDDEN, > jknight@HIDDEN > From: Mauro Aranda <maurooaranda@HIDDEN> > > Thanks. Revised patch attached. Thanks, this LGTM.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 13 Mar 2025 15:11:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 11:11:37 2025 Received: from localhost ([127.0.0.1]:57674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tskDf-0005Rm-Ru for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 11:11:36 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:52438) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1tskDb-0005RS-TX for 3860 <at> debbugs.gnu.org; Thu, 13 Mar 2025 11:11:33 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22349bb8605so24551145ad.0 for <3860 <at> debbugs.gnu.org>; Thu, 13 Mar 2025 08:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741878685; x=1742483485; darn=debbugs.gnu.org; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ATW2MYt8grzEIzNQszsIKDFZjRbooQv7WlUQcApurak=; b=L/M6fRkmbzNI6/LCmfTCSUNyyNOqdey0D5G9qUkgZM0habPbtH+fwP6c2iJplWyX2t CpPxzafwtaSWUg7UQ31lcuDyvQ7meRvW+4aAoocRRNVNcLkUgBw6Hjr08QIRZU3cQ90v wZxgB30ze4vaD/2Ftevsp1MXPzuDgWTDP2vmih58uwqQ371Mcut2yQMkSbToIJLjC1gK lLofqRn5VMWEZgr8RuJt19h1/yw2CQugbcsayq9QZZH6KMJvQBBA4xu1DFdHC2iiY1cK /trRFDp7I/cA9BhPBc3WDWzU7/AzOjsDzJfF/MDEbekriaHLbdeN5Bqmja0ckISZ8Guq f0Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741878685; x=1742483485; h=in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ATW2MYt8grzEIzNQszsIKDFZjRbooQv7WlUQcApurak=; b=XG4c94IjRVPy6UEKFvMjDKKgng9fEMC+dB67INra/+D3D5FnjJeZkRkNpwUbl0pPns J/HWSFKSaQHX8DRnqqX4jI0W7tko+CQsE7xiQ9LadkGTgeo5/uGlen1K9lNnCVhFSu1E IDwi5rsGW+7/KIytTNMZfMV62rNWvtgmMANYTK5HOGraNzYnGamSdf7czGK3nFvh0uuT K/BBRm6prgj3SezyqPY5j+qYsfL/cxiYkpBQ0M2xv5tg32ShHJfkmPUNWHOVk0wz1WgJ J3JxnKswfyk3r3D6ORj2kkmkVnf/EYNu3MpGg0GEBnDSRjz/52IrFo6YZlVup9E4cXyl cq+A== X-Gm-Message-State: AOJu0YwvXlGj7bbtYOASu2mKTPljIfhH1Yto7ehkWt4mS01h7zPmFvMB DnKDebr2J7h9TVgdL8XuMU2tqmVSQ9CSyz/WQrchr/O+ewtqSA4C X-Gm-Gg: ASbGncuxSm3t0Sp9JnylOeCoZ13KGxbDomyKL48ZwjQ67kzCCstcyh3bQRjYJJGtgd9 cL1IyJYfMuXX5fA3aW1BnJUTq/9dFXZYGEaqRq8c+6ee8uVi6CasJRwA7H1Vi7yxX5VYtcXVJq0 3BvYuFW83K7cp+rxHoDwxuvrXynCW0RuuFzDo5hNoQyiJIbnROEEZMYByDqbV/ino9Tkj9G/aja lXOtyvYiVT3LnzwI73r6KxNT/mlPTeLIs2206D78BHpQQY7A9MlnFGBi3wCG8Pmd+DnP70TNwKH DL2V1W02Hq0Ngys4bc3laSdyS5Dt4bAC4l0ENRmfCGvmnbAH7tw= X-Google-Smtp-Source: AGHT+IFGEixaDSFFj9lf0MAdW/JG4B60EZjWBLBoLszjcExHuct9Vb5htjoGFPP+xiUxIv9kRYDzUg== X-Received: by 2002:a05:6a21:7a90:b0:1f5:6e00:14c4 with SMTP id adf61e73a8af0-1f5bd934678mr137025637.42.1741878685409; Thu, 13 Mar 2025 08:11:25 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56ea7c741sm1377863a12.52.2025.03.13.08.11.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 08:11:24 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------hRlzgK4h2II7PoFxdY5rK8hJ" Message-ID: <18998daf-a353-4a31-bf23-bcedb5ce1474@HIDDEN> Date: Thu, 13 Mar 2025 12:11:21 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: Eli Zaretskii <eliz@HIDDEN> References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> <86y0x90yvz.fsf@HIDDEN> Content-Language: en-US From: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <86y0x90yvz.fsf@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------hRlzgK4h2II7PoFxdY5rK8hJ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Eli Zaretskii <eliz@HIDDEN> writes: >> Date: Thu, 13 Mar 2025 09:04:52 -0300 >> Cc: Eli Zaretskii <eliz@HIDDEN>, Dmitry Gutov <dgutov@HIDDEN>, >> Lars Ingebrigtsen <larsi@HIDDEN>, spiegel@HIDDEN, jknight@HIDDEN >> From: Mauro Aranda <maurooaranda@HIDDEN> >> >> Eli Zaretskii <eliz@HIDDEN> writes: >> >> >> Cc: 3860 <at> debbugs.gnu.org, jknight@HIDDEN, spiegel@HIDDEN >> >> From: Dmitry Gutov <dgutov@HIDDEN> >> >> Date: Fri, 22 Jan 2021 00:35:07 +0200 >> >> >> >> On 21.01.2021 21:33, Eli Zaretskii wrote: >> >> > I think if we are going to make this optional with SVN, we should make >> >> > it optional with the other back-ends as well. VC always presented a >> >> > uniform UI and user experience with all back-ends, as far as possible >> >> > and reasonable. In this case, I think automatically marking the >> >> > conflicts as resolved makes a lot of sense, but I won't object to make >> >> > it opt-out, as long as it's done for every VCS that can support it. >> >> >> >> So someone might want to generalize the Git-specific variable: >> >> vc-git-resolve-conflicts. >> > >> > Yes, I think so. >> > >> >> But they'd have to consider what to do with the special value >> >> 'unstage-maybe', which doesn't really make sense for other backends. >> > >> > Right. >> >> I took a shot at it. Please review the attached patch. > > Thanks. > >> +(defcustom vc-bzr-resolve-conflicts 'default >> + "When non-nil, mark conflicted file as resolved upon saving. > > "If non-nil" is better, IMO. I was going to change it to that, but I realized the text was misleading. So I rephrased it. >> +If this is non-nil and there are no more conflict markers in the file, >> +VC will mark the saved file as resolved. > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > "VC will mark the conflicts in the saved file as resolved." > > Same comments for doc strings of all the other options, since this > text is repeated in all of them. Thanks. Revised patch attached. --------------hRlzgK4h2II7PoFxdY5rK8hJ Content-Type: text/x-patch; charset=UTF-8; name="0001-Make-marking-conflicted-files-as-resolved-upon-savin.patch" Content-Disposition: attachment; filename*0="0001-Make-marking-conflicted-files-as-resolved-upon-savin.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2NjRjYjg0ZGU5ZmE3NTZiNzVkODY5ZmRhYzJiMWI4YzhlZGE4OTJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFdlZCwgMTIgTWFyIDIwMjUgMDc6MjY6MTMgLTAzMDAKU3ViamVjdDog W1BBVENIXSBNYWtlIG1hcmtpbmcgY29uZmxpY3RlZCBmaWxlcyBhcyByZXNvbHZlZCB1cG9u IHNhdmluZyBvcHQtb3V0CgpUaGlzIGZpeGVzIEJ1ZyMzODYwLgoKKiBsaXNwL3ZjL3ZjLmVs ICh2Yy1yZXNvbHZlLWNvbmZsaWN0cyk6IE5ldyB1c2VyIG9wdGlvbi4KKiBsaXNwL3ZjL3Zj LWJ6ci5lbCAodmMtYnpyLXJlc29sdmUtY29uZmxpY3RzKTogTmV3IHVzZXIgb3B0aW9uLgoo dmMtYnpyLWZpbmQtZmlsZS1ob29rKTogVXNlIGl0LgoqIGxpc3AvdmMvdmMtaGcuZWwgKHZj LWhnLXJlc29sdmUtY29uZmxpY3RzKTogTmV3IHVzZXIgb3B0aW9uLgoodmMtaGctZmluZC1m aWxlLWhvb2spOiBVc2UgaXQuCiogbGlzcC92Yy92Yy1zdm4uZWwgKHZjLXN2bi1yZXNvbHZl LWNvbmZsaWN0cyk6IE5ldyB1c2VyIG9wdGlvbi4KKHZjLXN2bi1maW5kLWZpbGUtaG9vayk6 IFVzZSBpdC4KKiBsaXNwL3ZjL3ZjLWdpdC5lbCAodmMtZ2l0LXJlc29sdmUtY29uZmxpY3Rz KTogU3VwcG9ydAonZGVmYXVsdCcgYXMgYW4gb3B0aW9uLiAgQWRqdXN0IGRvY3N0cmluZyBh bmQgdmVyc2lvbi4KKHZjLWdpdC1maW5kLWZpbGUtaG9vayk6IFJlc3BlY3QgdmMtcmVzb2x2 ZS1jb25mbGljdHMuCiogZXRjL05FV1M6IEFubm91bmNlIHRoZSBuZXcgb3B0aW9ucy4KLS0t CiBldGMvTkVXUyAgICAgICAgICB8IDEyICsrKysrKysrKysrKwogbGlzcC92Yy92Yy1ienIu ZWwgfCAxNSArKysrKysrKysrKysrKy0KIGxpc3AvdmMvdmMtZ2l0LmVsIHwgMjEgKysrKysr KysrKysrKysrLS0tLS0tCiBsaXNwL3ZjL3ZjLWhnLmVsICB8IDE1ICsrKysrKysrKysrKysr LQogbGlzcC92Yy92Yy1zdm4uZWwgfCAxNSArKysrKysrKysrKysrKy0KIGxpc3AvdmMvdmMu ZWwgICAgIHwgMTUgKysrKysrKysrKysrKysrCiA2IGZpbGVzIGNoYW5nZWQsIDg0IGluc2Vy dGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMv TkVXUwppbmRleCAzOWIyMTk5NTY0ZC4uNjA0ZWQ4NjUzMjkgMTAwNjQ0Ci0tLSBhL2V0Yy9O RVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xMzY0LDYgKzEzNjQsMTggQEAgSXQgaXMgaW50ZW5k ZWQgdG8gYmUgYWRkZWQgdG8gdGhlICdsb2ctZWRpdC1kb25lLWhvb2snIHNvIHRoYXQKICd2 Yy1jdnMtY2hlY2tpbicgYmVoYXZlcyBsaWtlIGludm9raW5nICJjdnMgY29tbWl0IFtmaWxl cy4uLl0iIGZyb20gdGhlCiBjb21tYW5kIGxpbmUuCiAKKy0tLQorKioqIE5ldyB1c2VyIG9w dGlvbnMgJ3ZjLXJlc29sdmUtY29uZmxpY3RzJywgJ3ZjLSotcmVzb2x2ZS1jb25mbGljdHMn CitDb250cm9sIHdoZXRoZXIgdG8gbWFyayBhIGNvbmZsaWN0ZWQgZmlsZSBhcyByZXNvbHZl ZCB3aGVuIHNhdmluZy4KK1lvdSBjYW4gbm93IGNvbnRyb2wgaXQgZ2xvYmFsbHksIHdpdGgg J3ZjLXJlc29sdmUtY29uZmxpY3RzJyBvciBmb3IKK3NwZWNpZmljIGJhY2tlbmRzIHdpdGgg J3ZjLWJ6ci1yZXNvbHZlLWNvbmZsaWN0cycsCisndmMtaGctcmVzb2x2ZS1jb25mbGljdHMn IGFuZCAndmMtc3ZuLXJlc29sdmUtY29uZmxpY3RzJy4KKy0tLQorKioqIE5ldyB2YWx1ZSBm b3IgJ3ZjLWdpdC1yZXNvbHZlLWNvbmZsaWN0cycKK1RoZSBvcHRpb24gbm93IGFjY2VwdHMg dGhlIHN5bWJvbCAnZGVmYXVsdCcgYXMgYSB2YWx1ZSwgd2hpY2ggaXMKK2l0cyBkZWZhdWx0 IHZhbHVlLiAgRWZmZWN0aXZlbHksIHRoZSBkZWZhdWx0IHZhbHVlIGhhc24ndCBjaGFuZ2Vk LAorc2luY2UgJ3ZjLXJlc29sdmUtY29uZmxpY3RzJyBkZWZhdWx0cyB0byB0LCB0aGUgcHJl dmlvdXMgZGVmYXVsdCB2YWx1ZQorZm9yICd2Yy1naXQtcmVzb2x2ZS1jb25mbGljdHMnLgog KiogRGlmZiBtb2RlCiAKICsrKwpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy1ienIuZWwgYi9s aXNwL3ZjL3ZjLWJ6ci5lbAppbmRleCAwOTA3ZWFlZTQ0OC4uMWJhNDQ1MGNmNWQgMTAwNjQ0 Ci0tLSBhL2xpc3AvdmMvdmMtYnpyLmVsCisrKyBiL2xpc3AvdmMvdmMtYnpyLmVsCkBAIC0x MTAsNiArMTEwLDE2IEBAIHZjLWJ6ci1zdGF0dXMtc3dpdGNoZXMKICAgICAgICAgICAgICAg ICAgKHJlcGVhdCA6dGFnICJBcmd1bWVudCBMaXN0IiA6dmFsdWUgKCIiKSBzdHJpbmcpKQog ICA6dmVyc2lvbiAiMjQuMSIpCiAKKyhkZWZjdXN0b20gdmMtYnpyLXJlc29sdmUtY29uZmxp Y3RzICdkZWZhdWx0CisgICJXaGV0aGVyIHRvIG1hcmsgY29uZmxpY3RlZCBmaWxlIGFzIHJl c29sdmVkIHVwb24gc2F2aW5nLgorSWYgdGhpcyBpcyB0IGFuZCB0aGVyZSBhcmUgbm8gbW9y ZSBjb25mbGljdCBtYXJrZXJzIGluIHRoZSBmaWxlLAorVkMgd2lsbCBtYXJrIHRoZSBjb25m bGljdHMgaW4gdGhlIHNhdmVkIGZpbGUgYXMgcmVzb2x2ZWQuCitBIHZhbHVlIG9mIGBkZWZh dWx0JyBtZWFucyB0byB1c2UgdGhlIHZhbHVlIG9mIGB2Yy1yZXNvbHZlLWNvbmZsaWN0cycu IgorICA6dHlwZSAnKGNob2ljZSAoY29uc3QgOnRhZyAiRG9uJ3QgcmVzb2x2ZSIgbmlsKQor ICAgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiUmVzb2x2ZSIgdCkKKyAgICAgICAgICAg ICAgICAgKGNvbnN0IDp0YWcgIlVzZSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyIgZGVmYXVsdCkp CisgIDp2ZXJzaW9uICIzMS4xIikKKwogOzsgc2luY2UgdjAuOSwgYnpyIHN1cHBvcnRzIHJl bW92aW5nIHRoZSBwcm9ncmVzcyBpbmRpY2F0b3JzCiA7OyBieSBzZXR0aW5nIGVudmlyb25t ZW50IHZhcmlhYmxlIEJaUl9QUk9HUkVTU19CQVIgdG8gIm5vbmUiLgogKGRlZnVuIHZjLWJ6 ci1jb21tYW5kIChienItY29tbWFuZCBidWZmZXIgb2tzdGF0dXMgZmlsZS1vci1saXN0ICZy ZXN0IGFyZ3MpCkBAIC01MzEsNyArNTQxLDEwIEBAIHZjLWJ6ci1maW5kLWZpbGUtaG9vawog ICAgIDs7IGJ1dCB0aGUgb25lIGluIGBienIgcHVsbCcgaXNuJ3QsIHNvIGl0IHdvdWxkIGJl IGdvb2QgdG8gcHJvdmlkZSBhbgogICAgIDs7IGVsaXNwIGZ1bmN0aW9uIHRvIHJlbWVyZ2Ug ZnJvbSB0aGUgLkJBU0UvT1RIRVIvVEhJUyBmaWxlcy4KICAgICAoc21lcmdlLXN0YXJ0LXNl c3Npb24pCi0gICAgKGFkZC1ob29rICdhZnRlci1zYXZlLWhvb2sgIyd2Yy1ienItcmVzb2x2 ZS13aGVuLWRvbmUgbmlsIHQpCisgICAgKHdoZW4gKG9yIChlcSB2Yy1ienItcmVzb2x2ZS1j b25mbGljdHMgdCkKKyAgICAgICAgICAgICAgKGFuZCAoZXEgdmMtYnpyLXJlc29sdmUtY29u ZmxpY3RzICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgIHZjLXJlc29sdmUtY29uZmxp Y3RzKSkKKyAgICAgIChhZGQtaG9vayAnYWZ0ZXItc2F2ZS1ob29rICMndmMtYnpyLXJlc29s dmUtd2hlbi1kb25lIG5pbCB0KSkKICAgICAodmMtbWVzc2FnZS11bnJlc29sdmVkLWNvbmZs aWN0cyBidWZmZXItZmlsZS1uYW1lKSkpCiAKIChkZWZ1biB2Yy1ienItY2xvbmUgKHJlbW90 ZSBkaXJlY3RvcnkgcmV2KQpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy1naXQuZWwgYi9saXNw L3ZjL3ZjLWdpdC5lbAppbmRleCA3ODgyN2M3NDY5MS4uOTMyZGRkYWVmYmIgMTAwNjQ0Ci0t LSBhL2xpc3AvdmMvdmMtZ2l0LmVsCisrKyBiL2xpc3AvdmMvdmMtZ2l0LmVsCkBAIC0xNjYs MTcgKzE2NiwyNCBAQCB2Yy1naXQtZmlsZS1uYW1lLWNoYW5nZXMtc3dpdGNoZXMKICAgICAg ICAgICAgICAgICAgKHJlcGVhdCA6dGFnICJBcmd1bWVudCBMaXN0IiA6dmFsdWUgKCIiKSBz dHJpbmcpKQogICA6dmVyc2lvbiAiMzAuMSIpCiAKLShkZWZjdXN0b20gdmMtZ2l0LXJlc29s dmUtY29uZmxpY3RzIHQKLSAgIldoZW4gbm9uLW5pbCwgbWFyayBjb25mbGljdGVkIGZpbGUg YXMgcmVzb2x2ZWQgdXBvbiBzYXZpbmcuCisoZGVmY3VzdG9tIHZjLWdpdC1yZXNvbHZlLWNv bmZsaWN0cyAnZGVmYXVsdAorICAiV2hldGhlciB0byBtYXJrIGNvbmZsaWN0ZWQgZmlsZSBh cyByZXNvbHZlZCB1cG9uIHNhdmluZy4KIFRoYXQgaXMgcGVyZm9ybWVkIGFmdGVyIGFsbCBj b25mbGljdCBtYXJrZXJzIGluIGl0IGhhdmUgYmVlbiByZW1vdmVkLgorCitJZiB0aGlzIGlz IHQgYW5kIHRoZXJlIGFyZSBubyBtb3JlIGNvbmZsaWN0IG1hcmtlcnMgaW4gdGhlIGZpbGUs CitWQyB3aWxsIG1hcmsgdGhlIGNvbmZsaWN0cyBpbiB0aGUgc2F2ZWQgZmlsZSBhcyByZXNv bHZlZC4KKwogSWYgdGhlIHZhbHVlIGlzIGB1bnN0YWdlLW1heWJlJywgYW5kIG5vIG1lcmdl LCByZWJhc2Ugb3Igc2ltaWxhcgogb3BlcmF0aW9uIGlzIGluIHByb2dyZXNzLCB0aGVuIGFm dGVyIHRoZSBsYXN0IGNvbmZsaWN0IGlzIHJlc29sdmVkLCBhbHNvCi1jbGVhciB0aGUgc3Rh Z2luZyBhcmVhLiIKK2NsZWFyIHRoZSBzdGFnaW5nIGFyZWEuCisKK0EgdmFsdWUgb2YgYGRl ZmF1bHQnIG1lYW5zIHRvIHVzZSB0aGUgdmFsdWUgb2YgYHZjLXJlc29sdmUtY29uZmxpY3Rz Jy4iCiAgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dGFnICJEb24ndCByZXNvbHZlIiBuaWwp CiAgICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJSZXNvbHZlIiB0KQogICAgICAgICAg ICAgICAgICAoY29uc3QgOnRhZyAiUmVzb2x2ZSBhbmQgbWF5YmUgdW5zdGFnZSBhbGwgZmls ZXMiCi0gICAgICAgICAgICAgICAgICAgICAgICB1bnN0YWdlLW1heWJlKSkKLSAgOnZlcnNp b24gIjI1LjEiKQorICAgICAgICAgICAgICAgICAgICAgICAgdW5zdGFnZS1tYXliZSkKKyAg ICAgICAgICAgICAgICAgKGNvbnN0IDp0YWcgIlVzZSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyIg ZGVmYXVsdCkpCisgIDp2ZXJzaW9uICIzMS4xIikKIAogKGRlZmN1c3RvbSB2Yy1naXQtcHJv Z3JhbSAiZ2l0IgogICAiTmFtZSBvZiB0aGUgR2l0IGV4ZWN1dGFibGUgKGV4Y2x1ZGluZyBh bnkgYXJndW1lbnRzKS4iCkBAIC0xNDQ1LDcgKzE0NTIsOSBAQCB2Yy1naXQtZmluZC1maWxl LWhvb2sKICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCiAgICAgICAg ICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgIl48PDw8PDw8ICIgbmlsICdub2Vycm9yKSkp CiAgICAgKHNtZXJnZS1zdGFydC1zZXNzaW9uKQotICAgICh3aGVuIHZjLWdpdC1yZXNvbHZl LWNvbmZsaWN0cworICAgICh1bmxlc3MgKG9yIChudWxsIHZjLWdpdC1yZXNvbHZlLWNvbmZs aWN0cykKKyAgICAgICAgICAgICAgICAoYW5kIChlcSB2Yy1naXQtcmVzb2x2ZS1jb25mbGlj dHMgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgICAobm90IHZjLXJlc29sdmUtY29u ZmxpY3RzKSkpCiAgICAgICAoYWRkLWhvb2sgJ2FmdGVyLXNhdmUtaG9vayAjJ3ZjLWdpdC1y ZXNvbHZlLXdoZW4tZG9uZSBuaWwgJ2xvY2FsKSkKICAgICAodmMtbWVzc2FnZS11bnJlc29s dmVkLWNvbmZsaWN0cyBidWZmZXItZmlsZS1uYW1lKSkpCiAKZGlmZiAtLWdpdCBhL2xpc3Av dmMvdmMtaGcuZWwgYi9saXNwL3ZjL3ZjLWhnLmVsCmluZGV4IGI0ZDc4NDQwMTNhLi5iNzIw MGRhMDkxNCAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1oZy5lbAorKysgYi9saXNwL3ZjL3Zj LWhnLmVsCkBAIC0xODMsNiArMTgzLDE2IEBAIHZjLWhnLWNyZWF0ZS1ib29rbWFyawogICAg ICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiQXNrIiBhc2spKQogICA6dmVyc2lvbiAiMjgu MSIpCiAKKyhkZWZjdXN0b20gdmMtaGctcmVzb2x2ZS1jb25mbGljdHMgJ2RlZmF1bHQKKyAg IldoZXRoZXIgdG8gbWFyayBjb25mbGljdGVkIGZpbGUgYXMgcmVzb2x2ZWQgdXBvbiBzYXZp bmcuCitJZiB0aGlzIGlzIHQgYW5kIHRoZXJlIGFyZSBubyBtb3JlIGNvbmZsaWN0IG1hcmtl cnMgaW4gdGhlIGZpbGUsCitWQyB3aWxsIG1hcmsgdGhlIGNvbmZsaWN0cyBpbiB0aGUgc2F2 ZWQgZmlsZSBhcyByZXNvbHZlZC4KK0EgdmFsdWUgb2YgYGRlZmF1bHQnIG1lYW5zIHRvIHVz ZSB0aGUgdmFsdWUgb2YgYHZjLXJlc29sdmUtY29uZmxpY3RzJy4iCisgIDp0eXBlICcoY2hv aWNlIChjb25zdCA6dGFnICJEb24ndCByZXNvbHZlIiBuaWwpCisgICAgICAgICAgICAgICAg IChjb25zdCA6dGFnICJSZXNvbHZlIiB0KQorICAgICAgICAgICAgICAgICAoY29uc3QgOnRh ZyAiVXNlIHZjLXJlc29sdmUtY29uZmxpY3RzIiBkZWZhdWx0KSkKKyAgOnZlcnNpb24gIjMx LjEiKQorCiAMCiA7OyBDbGVhciB1cCB0aGUgY2FjaGUgdG8gZm9yY2UgdmMtY2FsbCB0byBj aGVjayBhZ2FpbiBhbmQgZGlzY292ZXIKIDs7IG5ldyBmdW5jdGlvbnMgd2hlbiB3ZSByZWxv YWQgdGhpcyBmaWxlLgpAQCAtMTI2Myw3ICsxMjczLDEwIEBAIHZjLWhnLWZpbmQtZmlsZS1o b29rCiAgICAgOzsgSGcgbWF5IG5vdCByZWNvZ25pemUgImNvbmZsaWN0IiBhcyBhIHN0YXRl LCBidXQgd2UgY2FuIGRvIGJldHRlci4KICAgICAodmMtZmlsZS1zZXRwcm9wIGJ1ZmZlci1m aWxlLW5hbWUgJ3ZjLXN0YXRlICdjb25mbGljdCkKICAgICAoc21lcmdlLXN0YXJ0LXNlc3Np b24pCi0gICAgKGFkZC1ob29rICdhZnRlci1zYXZlLWhvb2sgIyd2Yy1oZy1yZXNvbHZlLXdo ZW4tZG9uZSBuaWwgdCkKKyAgICAod2hlbiAob3IgKGVxIHZjLWhnLXJlc29sdmUtY29uZmxp Y3RzIHQpCisgICAgICAgICAgICAgIChhbmQgKGVxIHZjLWhnLXJlc29sdmUtY29uZmxpY3Rz ICdkZWZhdWx0KQorICAgICAgICAgICAgICAgICAgIHZjLXJlc29sdmUtY29uZmxpY3RzKSkK KyAgICAgIChhZGQtaG9vayAnYWZ0ZXItc2F2ZS1ob29rICMndmMtaGctcmVzb2x2ZS13aGVu LWRvbmUgbmlsIHQpKQogICAgICh2Yy1tZXNzYWdlLXVucmVzb2x2ZWQtY29uZmxpY3RzIGJ1 ZmZlci1maWxlLW5hbWUpKSkKIAogKGRlZnVuIHZjLWhnLWNsb25lIChyZW1vdGUgZGlyZWN0 b3J5IHJldikKZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtc3ZuLmVsIGIvbGlzcC92Yy92Yy1z dm4uZWwKaW5kZXggNDIyZWY0OGY4YzAuLmU4MTYzNjU1MmI1IDEwMDY0NAotLS0gYS9saXNw L3ZjL3ZjLXN2bi5lbAorKysgYi9saXNwL3ZjL3ZjLXN2bi5lbApAQCAtMTA2LDYgKzEwNiwx NiBAQCB2Yy1zdm4taGVhZGVyCiAgIDp2ZXJzaW9uICIyNC4xIiAgICAgOyBubyBsb25nZXIg Y29uc3VsdCB0aGUgb2Jzb2xldGUgdmMtaGVhZGVyLWFsaXN0CiAgIDp0eXBlICcocmVwZWF0 IHN0cmluZykpCiAKKyhkZWZjdXN0b20gdmMtc3ZuLXJlc29sdmUtY29uZmxpY3RzICdkZWZh dWx0CisgICJXaGV0aGVyIHRvIG1hcmsgY29uZmxpY3RlZCBmaWxlIGFzIHJlc29sdmVkIHVw b24gc2F2aW5nLgorSWYgdGhpcyBpcyB0IGFuZCB0aGVyZSBhcmUgbm8gbW9yZSBjb25mbGlj dCBtYXJrZXJzIGluIHRoZSBmaWxlLAorVkMgd2lsbCBtYXJrIHRoZSBjb25mbGljdHMgaW4g dGhlIHNhdmVkIGZpbGUgYXMgcmVzb2x2ZWQuCitBIHZhbHVlIG9mIGBkZWZhdWx0JyBtZWFu cyB0byB1c2UgdGhlIHZhbHVlIG9mIGB2Yy1yZXNvbHZlLWNvbmZsaWN0cycuIgorICA6dHlw ZSAnKGNob2ljZSAoY29uc3QgOnRhZyAiRG9uJ3QgcmVzb2x2ZSIgbmlsKQorICAgICAgICAg ICAgICAgICAoY29uc3QgOnRhZyAiUmVzb2x2ZSIgdCkKKyAgICAgICAgICAgICAgICAgKGNv bnN0IDp0YWcgIlVzZSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyIgZGVmYXVsdCkpCisgIDp2ZXJz aW9uICIzMS4xIikKKwogOzsgV2Ugd2FudCB0byBhdXRvbG9hZCBpdCBmb3IgdXNlIGJ5IHRo ZSBhdXRvbG9hZGVkIHZlcnNpb24gb2YKIDs7IHZjLXN2bi1yZWdpc3RlcmVkLCBidXQgd2Ug d2FudCB0aGUgdmFsdWUgdG8gYmUgY29tcGlsZWQgYXQgc3RhcnR1cCwgbm90CiA7OyBhdCBk dW1wIHRpbWUuCkBAIC02ODgsNyArNjk4LDEwIEBAIHZjLXN2bi1maW5kLWZpbGUtaG9vawog ICAgICAgICA7OyBUaGVyZSBhcmUgY29uZmxpY3QgbWFya2Vycy4KICAgICAgICAgKHByb2du CiAgICAgICAgICAgKHNtZXJnZS1zdGFydC1zZXNzaW9uKQotICAgICAgICAgIChhZGQtaG9v ayAnYWZ0ZXItc2F2ZS1ob29rICMndmMtc3ZuLXJlc29sdmUtd2hlbi1kb25lIG5pbCB0KSkK KyAgICAgICAgICAod2hlbiAob3IgKGVxIHZjLXN2bi1yZXNvbHZlLWNvbmZsaWN0cyB0KQor ICAgICAgICAgICAgICAoYW5kIChlcSB2Yy1zdm4tcmVzb2x2ZS1jb25mbGljdHMgJ2RlZmF1 bHQpCisgICAgICAgICAgICAgICAgICAgdmMtcmVzb2x2ZS1jb25mbGljdHMpKQorICAgICAg ICAgICAgKGFkZC1ob29rICdhZnRlci1zYXZlLWhvb2sgIyd2Yy1zdm4tcmVzb2x2ZS13aGVu LWRvbmUgbmlsIHQpKSkKICAgICAgIDs7IFRoZXJlIGFyZSBubyBjb25mbGljdCBtYXJrZXJz LiAgVGhpcyBpcyBwcm9ibGVtYXRpYzogbWF5YmUgaXQgbWVhbnMKICAgICAgIDs7IHRoZSBj b25mbGljdCBoYXMgYmVlbiByZXNvbHZlZCBhbmQgd2Ugc2hvdWxkIGltbWVkaWF0ZWx5IGNh bGwgInN2bgogICAgICAgOzsgcmVzb2x2ZWQiLCBvciBpdCBtZWFucyB0aGF0IHRoZSBmaWxl J3MgdHlwZSBkb2VzIG5vdCBhbGxvdyBTdm4gdG8KZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMu ZWwgYi9saXNwL3ZjL3ZjLmVsCmluZGV4IGJjOTYxNzNkMTk4Li5mZjYxYTllNzUwMSAxMDA2 NDQKLS0tIGEvbGlzcC92Yy92Yy5lbAorKysgYi9saXNwL3ZjL3ZjLmVsCkBAIC05OTksNiAr OTk5LDIxIEBAIHZjLWNsb25lLWhldXJpc3RpYy1hbGlzdAogICAgICAgICAgICAgICAgIDp2 YWx1ZS10eXBlICx2Yy1jbG9uZWFibGUtYmFja2VuZHMtY3VzdG9tLXR5cGUpCiAgIDp2ZXJz aW9uICIzMS4xIikKIAorKGRlZmN1c3RvbSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyB0CisgICJX aGV0aGVyIHRvIG1hcmsgY29uZmxpY3RlZCBmaWxlIGFzIHJlc29sdmVkIHVwb24gc2F2aW5n LgorCitJZiB0aGlzIGlzIG5vbi1uaWwgYW5kIHRoZXJlIGFyZSBubyBtb3JlIGNvbmZsaWN0 IG1hcmtlcnMgaW4gdGhlIGZpbGUsCitWQyB3aWxsIG1hcmsgdGhlIGNvbmZsaWN0cyBpbiB0 aGUgc2F2ZWQgZmlsZSBhcyByZXNvbHZlZC4gIFRoaXMgaXMKK29ubHkgbWVhbmluZ2Z1bCBm b3IgVkNTIHRoYXQgaGFuZGxlIGNvbmZsaWN0cyBieSBpbnNlcnRpbmcgY29uZmxpY3QKK21h cmtlcnMgaW4gYSBjb25mbGljdGVkIGZpbGUuCisKK1doZW4gc2F2aW5nIGEgY29uZmxpY3Rl ZCBmaWxlLCBWQyBmaXJzdCB0cmllcyB0byB1c2UgdGhlIHZhbHVlCitvZiBgdmMtQkFDS0VO RC1yZXNvbHZlLWNvbmZsaWN0cycsIGZvciBoYW5kbGluZyBiYWNrZW5kLXNwZWNpZmljCitz ZXR0aW5ncy4gIEl0IGRlZmF1bHRzIHRvIHRoaXMgb3B0aW9uIGlmIHRoYXQgb3B0aW9uIGhh cyB0aGUgc3BlY2lhbAordmFsdWUgYGRlZmF1bHQnLiIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAg OnZlcnNpb24gIjMxLjEiKQorCiAMCiA7OyBGaWxlIHByb3BlcnR5IGNhY2hpbmcKIAotLSAK Mi4zNC4xCgo= --------------hRlzgK4h2II7PoFxdY5rK8hJ--
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 13 Mar 2025 14:49:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 10:49:16 2025 Received: from localhost ([127.0.0.1]:57638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tsjs3-0004D2-U2 for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 10:49:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45218) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1tsjs1-0004Ck-8h for 3860 <at> debbugs.gnu.org; Thu, 13 Mar 2025 10:49:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1tsjru-0004gb-9y; Thu, 13 Mar 2025 10:49:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=QD6fisCAkfLD2/y+DYT8WaWn1MgqsjgOR5MnlQCtnlg=; b=FuDXB/KzV3dbtGmOw8/U 4nV+kmMq3URc5Zkxgy6lC88DLKVXDAuQ0xxawNpMDqZ6ffzJJ3+hNc2MB3o73YpnaXKF2nfF48clM uLK3b6Rt2Nhd7FqMNekPpH4Te5/I9xUw6zicd9F3w5R6vIbt0xdju+WZSyVhWlkYbKA64mc4FpImG Zj7eHBWFiCJpho9JpoqznfOSSjLysBbZfclee2DibfwPKQloKi69tzyirMLY0fVvoIeZxGjB0pLSm ioQ2ApeC3R+YnbrdAqqecpBB0173KjrxpmvWFhmfEXI0IRlRv51x6bog58qsGjZHztUCh5b7hrb5T jSj5qr/2rrjNgA==; Date: Thu, 13 Mar 2025 16:49:04 +0200 Message-Id: <86y0x90yvz.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> (message from Mauro Aranda on Thu, 13 Mar 2025 09:04:52 -0300) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, jknight@HIDDEN, spiegel@HIDDEN, dgutov@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Date: Thu, 13 Mar 2025 09:04:52 -0300 > Cc: Eli Zaretskii <eliz@HIDDEN>, Dmitry Gutov <dgutov@HIDDEN>, > Lars Ingebrigtsen <larsi@HIDDEN>, spiegel@HIDDEN, jknight@HIDDEN > From: Mauro Aranda <maurooaranda@HIDDEN> > > Eli Zaretskii <eliz@HIDDEN> writes: > > >> Cc: 3860 <at> debbugs.gnu.org, jknight@HIDDEN, spiegel@HIDDEN > >> From: Dmitry Gutov <dgutov@HIDDEN> > >> Date: Fri, 22 Jan 2021 00:35:07 +0200 > >> > >> On 21.01.2021 21:33, Eli Zaretskii wrote: > >> > I think if we are going to make this optional with SVN, we should make > >> > it optional with the other back-ends as well. VC always presented a > >> > uniform UI and user experience with all back-ends, as far as possible > >> > and reasonable. In this case, I think automatically marking the > >> > conflicts as resolved makes a lot of sense, but I won't object to make > >> > it opt-out, as long as it's done for every VCS that can support it. > >> > >> So someone might want to generalize the Git-specific variable: > >> vc-git-resolve-conflicts. > > > > Yes, I think so. > > > >> But they'd have to consider what to do with the special value > >> 'unstage-maybe', which doesn't really make sense for other backends. > > > > Right. > > I took a shot at it. Please review the attached patch. Thanks. > +(defcustom vc-bzr-resolve-conflicts 'default > + "When non-nil, mark conflicted file as resolved upon saving. "If non-nil" is better, IMO. > +If this is non-nil and there are no more conflict markers in the file, > +VC will mark the saved file as resolved. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ "VC will mark the conflicts in the saved file as resolved." Same comments for doc strings of all the other options, since this text is repeated in all of them.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 13 Mar 2025 12:05:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 08:05:07 2025 Received: from localhost ([127.0.0.1]:54019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tshJC-00045C-UM for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 08:05:07 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:43262) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1tshJA-00041T-2Y for 3860 <at> debbugs.gnu.org; Thu, 13 Mar 2025 08:05:05 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22334203781so35608495ad.0 for <3860 <at> debbugs.gnu.org>; Thu, 13 Mar 2025 05:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741867497; x=1742472297; darn=debbugs.gnu.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=fzCc2J8uGmrc4TyKY183qK9qMPz+iNS5bA7oyj6ps1c=; b=UEi1yOnxVx8QSNm8+R+BGcAuWYP9mi2xPsPNaexZHU/VCBPW5KiEaJVVRAqCJvF13g 3CxaSFhnqqV2Qt3P1CC3zn+xVlPQghdN09tm9K3qf8tPWiAgeeGw07QaiamHrb7VJBhf vEhov63+vBDy4TpsPu+KkKGZr5Cs50PGi14SQawrlrak1FsSx/f1o34M8MoMSNSWwUlu /NFN6f/Uk1zrzAipF1Jmm7FjxXPeUrh6aKX0Tj9LvdDHoHK8c+paaqKHnCPW+jAU+cgp 0FaNDzWWsQpXkBLtrvdzbeXrGqAobQY/BTrtgTejsRucfW836wMeYqvdEpuyCSEAFzR5 c4xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741867497; x=1742472297; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fzCc2J8uGmrc4TyKY183qK9qMPz+iNS5bA7oyj6ps1c=; b=s3XgPpJ2i/jwrHh3ZFFAWHxKpiit2Tb1HgGjRHiMYsmrOu5hGxUYXfBCgs4rojsqed 3aqhGtm4FEfOp4LpkcjaSTN67sg3T9fQ39Ye5kYHENyeb53cTS9wgRdDf4/9lqS3qnp2 dxyr77HHF8ZIBoIpZRQK2nFI70utcg93c21KYbAtrcbrOzzju0P28R/lx5QToeQr1cEZ l/kUZGzDoiCx4s6v8LPeNYYO3ZGx90QKnga27+szC/90J6b1qdRdIOR0QMQJiM6Yq6wF uV3lB30WHwxffEN5Uuz5BjMafA4CAOKZD/ooO5KCyAgRcddSmwpRwUbnMP1Dt3NcNAfX 0hMw== X-Gm-Message-State: AOJu0YwgBsM5reyMHjFTgcduJDlsRyBbmoc/0359LsmqdN0y8cUoaeKD 1F2FQvcz6dgnXqHvtPX2waCYxN2A9v4SAe9JJkIfETi3oLLTrBG63QwaFKoE X-Gm-Gg: ASbGnctrzhvmLbkz/hbXFVHty3AO2WKve2l0cyLZ05juTIY3YwfKL3V9Yt/Htf26kLE ssjrReIdmqzZ0FJtIMydtJKPWfsz3XWMr2YUWp4Hn92YFX1mtuwQTxE6/lU9vA+ZjU8ozrNHL07 5yOfcIG9ia2V+/tryms0qH9BQzeuB3ajXF6DVU7f7Y+OWJ1jiIl9wWgqNCjUja7GE3D1KQ+p3T8 n6zq1U27jU1LXAM6dZF4KI8kQTZLzQlKBiSMIchtxndLOdZ1rZ7DsqhlSr63OI3buoB3eOerNvL 3EPbpapDRcjPF/ttF5TMdxUyL24qvv9lsdOL/k62NQyxc88X9H0= X-Google-Smtp-Source: AGHT+IGDIPvYkECWnqVpzX3ST4kdsPWg3aCRIlqQ/O4Q9yRwssE+q5CB0glODxZ0vlb9QK9VT8r+VQ== X-Received: by 2002:a17:902:dac2:b0:215:58be:3349 with SMTP id d9443c01a7336-225c666a6bdmr35198155ad.14.1741867497202; Thu, 13 Mar 2025 05:04:57 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a406fsm11655315ad.64.2025.03.13.05.04.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Mar 2025 05:04:56 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------3z7cQ0l2Gz85wSuAxV1HrCMu" Message-ID: <7af95254-bea8-4249-9fd9-b126cb2c929d@HIDDEN> Date: Thu, 13 Mar 2025 09:04:52 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: 3860 <at> debbugs.gnu.org From: Mauro Aranda <maurooaranda@HIDDEN> Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: jknight@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, Lars Ingebrigtsen <larsi@HIDDEN>, spiegel@HIDDEN, Dmitry Gutov <dgutov@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------3z7cQ0l2Gz85wSuAxV1HrCMu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Eli Zaretskii <eliz@HIDDEN> writes: >> Cc: 3860 <at> debbugs.gnu.org, jknight@HIDDEN, spiegel@HIDDEN >> From: Dmitry Gutov <dgutov@HIDDEN> >> Date: Fri, 22 Jan 2021 00:35:07 +0200 >> >> On 21.01.2021 21:33, Eli Zaretskii wrote: >> > I think if we are going to make this optional with SVN, we should make >> > it optional with the other back-ends as well. VC always presented a >> > uniform UI and user experience with all back-ends, as far as possible >> > and reasonable. In this case, I think automatically marking the >> > conflicts as resolved makes a lot of sense, but I won't object to make >> > it opt-out, as long as it's done for every VCS that can support it. >> >> So someone might want to generalize the Git-specific variable: >> vc-git-resolve-conflicts. > > Yes, I think so. > >> But they'd have to consider what to do with the special value >> 'unstage-maybe', which doesn't really make sense for other backends. > > Right. I took a shot at it. Please review the attached patch. --------------3z7cQ0l2Gz85wSuAxV1HrCMu Content-Type: text/x-patch; charset=UTF-8; name="0001-Make-marking-conflicted-files-as-resolved-upon-savin.patch" Content-Disposition: attachment; filename*0="0001-Make-marking-conflicted-files-as-resolved-upon-savin.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA5MTAyNTIwN2MwNjM0N2Q4OGU5N2U4ODM0ZTk4Yzc3ZGIwYTE0NGFmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp bC5jb20+CkRhdGU6IFdlZCwgMTIgTWFyIDIwMjUgMDc6MjY6MTMgLTAzMDAKU3ViamVjdDog W1BBVENIXSBNYWtlIG1hcmtpbmcgY29uZmxpY3RlZCBmaWxlcyBhcyByZXNvbHZlZCB1cG9u IHNhdmluZyBvcHQtb3V0CgpUaGlzIGZpeGVzIEJ1ZyMzODYwLgoKKiBsaXNwL3ZjL3ZjLmVs ICh2Yy1yZXNvbHZlLWNvbmZsaWN0cyk6IE5ldyB1c2VyIG9wdGlvbi4KKiBsaXNwL3ZjL3Zj LWJ6ci5lbCAodmMtYnpyLXJlc29sdmUtY29uZmxpY3RzKTogTmV3IHVzZXIgb3B0aW9uLgoo dmMtYnpyLWZpbmQtZmlsZS1ob29rKTogVXNlIGl0LgoqIGxpc3AvdmMvdmMtaGcuZWwgKHZj LWhnLXJlc29sdmUtY29uZmxpY3RzKTogTmV3IHVzZXIgb3B0aW9uLgoodmMtaGctZmluZC1m aWxlLWhvb2spOiBVc2UgaXQuCiogbGlzcC92Yy92Yy1zdm4uZWwgKHZjLXN2bi1yZXNvbHZl LWNvbmZsaWN0cyk6IE5ldyB1c2VyIG9wdGlvbi4KKHZjLXN2bi1maW5kLWZpbGUtaG9vayk6 IFVzZSBpdC4KKiBsaXNwL3ZjL3ZjLWdpdC5lbCAodmMtZ2l0LXJlc29sdmUtY29uZmxpY3Rz KTogU3VwcG9ydAonZGVmYXVsdCcgYXMgYW4gb3B0aW9uLiAgQWRqdXN0IGRvY3N0cmluZyBh bmQgdmVyc2lvbi4KKHZjLWdpdC1maW5kLWZpbGUtaG9vayk6IFJlc3BlY3QgdmMtcmVzb2x2 ZS1jb25mbGljdHMuCiogZXRjL05FV1M6IEFubm91bmNlIHRoZSBuZXcgb3B0aW9ucy4KLS0t CiBldGMvTkVXUyAgICAgICAgICB8IDEyICsrKysrKysrKysrKwogbGlzcC92Yy92Yy1ienIu ZWwgfCAxNSArKysrKysrKysrKysrKy0KIGxpc3AvdmMvdmMtZ2l0LmVsIHwgMTQgKysrKysr KysrLS0tLS0KIGxpc3AvdmMvdmMtaGcuZWwgIHwgMTUgKysrKysrKysrKysrKystCiBsaXNw L3ZjL3ZjLXN2bi5lbCB8IDE1ICsrKysrKysrKysrKysrLQogbGlzcC92Yy92Yy5lbCAgICAg fCAxNSArKysrKysrKysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgNzggaW5zZXJ0aW9ucygr KSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdTCmlu ZGV4IDM5YjIxOTk1NjRkLi42MDRlZDg2NTMyOSAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysr IGIvZXRjL05FV1MKQEAgLTEzNjQsNiArMTM2NCwxOCBAQCBJdCBpcyBpbnRlbmRlZCB0byBi ZSBhZGRlZCB0byB0aGUgJ2xvZy1lZGl0LWRvbmUtaG9vaycgc28gdGhhdAogJ3ZjLWN2cy1j aGVja2luJyBiZWhhdmVzIGxpa2UgaW52b2tpbmcgImN2cyBjb21taXQgW2ZpbGVzLi4uXSIg ZnJvbSB0aGUKIGNvbW1hbmQgbGluZS4KIAorLS0tCisqKiogTmV3IHVzZXIgb3B0aW9ucyAn dmMtcmVzb2x2ZS1jb25mbGljdHMnLCAndmMtKi1yZXNvbHZlLWNvbmZsaWN0cycKK0NvbnRy b2wgd2hldGhlciB0byBtYXJrIGEgY29uZmxpY3RlZCBmaWxlIGFzIHJlc29sdmVkIHdoZW4g c2F2aW5nLgorWW91IGNhbiBub3cgY29udHJvbCBpdCBnbG9iYWxseSwgd2l0aCAndmMtcmVz b2x2ZS1jb25mbGljdHMnIG9yIGZvcgorc3BlY2lmaWMgYmFja2VuZHMgd2l0aCAndmMtYnpy LXJlc29sdmUtY29uZmxpY3RzJywKKyd2Yy1oZy1yZXNvbHZlLWNvbmZsaWN0cycgYW5kICd2 Yy1zdm4tcmVzb2x2ZS1jb25mbGljdHMnLgorLS0tCisqKiogTmV3IHZhbHVlIGZvciAndmMt Z2l0LXJlc29sdmUtY29uZmxpY3RzJworVGhlIG9wdGlvbiBub3cgYWNjZXB0cyB0aGUgc3lt Ym9sICdkZWZhdWx0JyBhcyBhIHZhbHVlLCB3aGljaCBpcworaXRzIGRlZmF1bHQgdmFsdWUu ICBFZmZlY3RpdmVseSwgdGhlIGRlZmF1bHQgdmFsdWUgaGFzbid0IGNoYW5nZWQsCitzaW5j ZSAndmMtcmVzb2x2ZS1jb25mbGljdHMnIGRlZmF1bHRzIHRvIHQsIHRoZSBwcmV2aW91cyBk ZWZhdWx0IHZhbHVlCitmb3IgJ3ZjLWdpdC1yZXNvbHZlLWNvbmZsaWN0cycuCiAqKiBEaWZm IG1vZGUKIAogKysrCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLWJ6ci5lbCBiL2xpc3AvdmMv dmMtYnpyLmVsCmluZGV4IDA5MDdlYWVlNDQ4Li44OTU0Y2Q3OTM0YiAxMDA2NDQKLS0tIGEv bGlzcC92Yy92Yy1ienIuZWwKKysrIGIvbGlzcC92Yy92Yy1ienIuZWwKQEAgLTExMCw2ICsx MTAsMTYgQEAgdmMtYnpyLXN0YXR1cy1zd2l0Y2hlcwogICAgICAgICAgICAgICAgICAocmVw ZWF0IDp0YWcgIkFyZ3VtZW50IExpc3QiIDp2YWx1ZSAoIiIpIHN0cmluZykpCiAgIDp2ZXJz aW9uICIyNC4xIikKIAorKGRlZmN1c3RvbSB2Yy1ienItcmVzb2x2ZS1jb25mbGljdHMgJ2Rl ZmF1bHQKKyAgIldoZW4gbm9uLW5pbCwgbWFyayBjb25mbGljdGVkIGZpbGUgYXMgcmVzb2x2 ZWQgdXBvbiBzYXZpbmcuCitJZiB0aGlzIGlzIG5vbi1uaWwgYW5kIHRoZXJlIGFyZSBubyBt b3JlIGNvbmZsaWN0IG1hcmtlcnMgaW4gdGhlIGZpbGUsCitWQyB3aWxsIG1hcmsgdGhlIHNh dmVkIGZpbGUgYXMgcmVzb2x2ZWQuCitBIHZhbHVlIG9mIGBkZWZhdWx0JyBtZWFucyB0byB1 c2UgdGhlIHZhbHVlIG9mIGB2Yy1yZXNvbHZlLWNvbmZsaWN0cycuIgorICA6dHlwZSAnKGNo b2ljZSAoY29uc3QgOnRhZyAiRG9uJ3QgcmVzb2x2ZSIgbmlsKQorICAgICAgICAgICAgICAg ICAoY29uc3QgOnRhZyAiUmVzb2x2ZSIgdCkKKyAgICAgICAgICAgICAgICAgKGNvbnN0IDp0 YWcgIlVzZSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyIgZGVmYXVsdCkpCisgIDp2ZXJzaW9uICIz MS4xIikKKwogOzsgc2luY2UgdjAuOSwgYnpyIHN1cHBvcnRzIHJlbW92aW5nIHRoZSBwcm9n cmVzcyBpbmRpY2F0b3JzCiA7OyBieSBzZXR0aW5nIGVudmlyb25tZW50IHZhcmlhYmxlIEJa Ul9QUk9HUkVTU19CQVIgdG8gIm5vbmUiLgogKGRlZnVuIHZjLWJ6ci1jb21tYW5kIChienIt Y29tbWFuZCBidWZmZXIgb2tzdGF0dXMgZmlsZS1vci1saXN0ICZyZXN0IGFyZ3MpCkBAIC01 MzEsNyArNTQxLDEwIEBAIHZjLWJ6ci1maW5kLWZpbGUtaG9vawogICAgIDs7IGJ1dCB0aGUg b25lIGluIGBienIgcHVsbCcgaXNuJ3QsIHNvIGl0IHdvdWxkIGJlIGdvb2QgdG8gcHJvdmlk ZSBhbgogICAgIDs7IGVsaXNwIGZ1bmN0aW9uIHRvIHJlbWVyZ2UgZnJvbSB0aGUgLkJBU0Uv T1RIRVIvVEhJUyBmaWxlcy4KICAgICAoc21lcmdlLXN0YXJ0LXNlc3Npb24pCi0gICAgKGFk ZC1ob29rICdhZnRlci1zYXZlLWhvb2sgIyd2Yy1ienItcmVzb2x2ZS13aGVuLWRvbmUgbmls IHQpCisgICAgKHdoZW4gKG9yIChlcSB2Yy1ienItcmVzb2x2ZS1jb25mbGljdHMgdCkKKyAg ICAgICAgICAgICAgKGFuZCAoZXEgdmMtYnpyLXJlc29sdmUtY29uZmxpY3RzICdkZWZhdWx0 KQorICAgICAgICAgICAgICAgICAgIHZjLXJlc29sdmUtY29uZmxpY3RzKSkKKyAgICAgIChh ZGQtaG9vayAnYWZ0ZXItc2F2ZS1ob29rICMndmMtYnpyLXJlc29sdmUtd2hlbi1kb25lIG5p bCB0KSkKICAgICAodmMtbWVzc2FnZS11bnJlc29sdmVkLWNvbmZsaWN0cyBidWZmZXItZmls ZS1uYW1lKSkpCiAKIChkZWZ1biB2Yy1ienItY2xvbmUgKHJlbW90ZSBkaXJlY3RvcnkgcmV2 KQpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy1naXQuZWwgYi9saXNwL3ZjL3ZjLWdpdC5lbApp bmRleCA3ODgyN2M3NDY5MS4uMWQ0MDkyYzBiMDQgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMt Z2l0LmVsCisrKyBiL2xpc3AvdmMvdmMtZ2l0LmVsCkBAIC0xNjYsMTcgKzE2NiwxOSBAQCB2 Yy1naXQtZmlsZS1uYW1lLWNoYW5nZXMtc3dpdGNoZXMKICAgICAgICAgICAgICAgICAgKHJl cGVhdCA6dGFnICJBcmd1bWVudCBMaXN0IiA6dmFsdWUgKCIiKSBzdHJpbmcpKQogICA6dmVy c2lvbiAiMzAuMSIpCiAKLShkZWZjdXN0b20gdmMtZ2l0LXJlc29sdmUtY29uZmxpY3RzIHQK KyhkZWZjdXN0b20gdmMtZ2l0LXJlc29sdmUtY29uZmxpY3RzICdkZWZhdWx0CiAgICJXaGVu IG5vbi1uaWwsIG1hcmsgY29uZmxpY3RlZCBmaWxlIGFzIHJlc29sdmVkIHVwb24gc2F2aW5n LgogVGhhdCBpcyBwZXJmb3JtZWQgYWZ0ZXIgYWxsIGNvbmZsaWN0IG1hcmtlcnMgaW4gaXQg aGF2ZSBiZWVuIHJlbW92ZWQuCiBJZiB0aGUgdmFsdWUgaXMgYHVuc3RhZ2UtbWF5YmUnLCBh bmQgbm8gbWVyZ2UsIHJlYmFzZSBvciBzaW1pbGFyCiBvcGVyYXRpb24gaXMgaW4gcHJvZ3Jl c3MsIHRoZW4gYWZ0ZXIgdGhlIGxhc3QgY29uZmxpY3QgaXMgcmVzb2x2ZWQsIGFsc28KLWNs ZWFyIHRoZSBzdGFnaW5nIGFyZWEuIgorY2xlYXIgdGhlIHN0YWdpbmcgYXJlYS4KK0EgdmFs dWUgb2YgYGRlZmF1bHQnIG1lYW5zIHRvIHVzZSB0aGUgdmFsdWUgb2YgYHZjLXJlc29sdmUt Y29uZmxpY3RzJy4iCiAgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dGFnICJEb24ndCByZXNv bHZlIiBuaWwpCiAgICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJSZXNvbHZlIiB0KQog ICAgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiUmVzb2x2ZSBhbmQgbWF5YmUgdW5zdGFn ZSBhbGwgZmlsZXMiCi0gICAgICAgICAgICAgICAgICAgICAgICB1bnN0YWdlLW1heWJlKSkK LSAgOnZlcnNpb24gIjI1LjEiKQorICAgICAgICAgICAgICAgICAgICAgICAgdW5zdGFnZS1t YXliZSkKKyAgICAgICAgICAgICAgICAgKGNvbnN0IDp0YWcgIlVzZSB2Yy1yZXNvbHZlLWNv bmZsaWN0cyIgZGVmYXVsdCkpCisgIDp2ZXJzaW9uICIzMS4xIikKIAogKGRlZmN1c3RvbSB2 Yy1naXQtcHJvZ3JhbSAiZ2l0IgogICAiTmFtZSBvZiB0aGUgR2l0IGV4ZWN1dGFibGUgKGV4 Y2x1ZGluZyBhbnkgYXJndW1lbnRzKS4iCkBAIC0xNDQ1LDcgKzE0NDcsOSBAQCB2Yy1naXQt ZmluZC1maWxlLWhvb2sKICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikp CiAgICAgICAgICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgIl48PDw8PDw8ICIgbmlsICdu b2Vycm9yKSkpCiAgICAgKHNtZXJnZS1zdGFydC1zZXNzaW9uKQotICAgICh3aGVuIHZjLWdp dC1yZXNvbHZlLWNvbmZsaWN0cworICAgICh1bmxlc3MgKG9yIChudWxsIHZjLWdpdC1yZXNv bHZlLWNvbmZsaWN0cykKKyAgICAgICAgICAgICAgICAoYW5kIChlcSB2Yy1naXQtcmVzb2x2 ZS1jb25mbGljdHMgJ2RlZmF1bHQpCisgICAgICAgICAgICAgICAgICAgICAobm90IHZjLXJl c29sdmUtY29uZmxpY3RzKSkpCiAgICAgICAoYWRkLWhvb2sgJ2FmdGVyLXNhdmUtaG9vayAj J3ZjLWdpdC1yZXNvbHZlLXdoZW4tZG9uZSBuaWwgJ2xvY2FsKSkKICAgICAodmMtbWVzc2Fn ZS11bnJlc29sdmVkLWNvbmZsaWN0cyBidWZmZXItZmlsZS1uYW1lKSkpCiAKZGlmZiAtLWdp dCBhL2xpc3AvdmMvdmMtaGcuZWwgYi9saXNwL3ZjL3ZjLWhnLmVsCmluZGV4IGI0ZDc4NDQw MTNhLi41OTllMDA5ZmI0NCAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1oZy5lbAorKysgYi9s aXNwL3ZjL3ZjLWhnLmVsCkBAIC0xODMsNiArMTgzLDE2IEBAIHZjLWhnLWNyZWF0ZS1ib29r bWFyawogICAgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiQXNrIiBhc2spKQogICA6dmVy c2lvbiAiMjguMSIpCiAKKyhkZWZjdXN0b20gdmMtaGctcmVzb2x2ZS1jb25mbGljdHMgJ2Rl ZmF1bHQKKyAgIldoZW4gbm9uLW5pbCwgbWFyayBjb25mbGljdGVkIGZpbGUgYXMgcmVzb2x2 ZWQgdXBvbiBzYXZpbmcuCitJZiB0aGlzIGlzIG5vbi1uaWwgYW5kIHRoZXJlIGFyZSBubyBt b3JlIGNvbmZsaWN0IG1hcmtlcnMgaW4gdGhlIGZpbGUsCitWQyB3aWxsIG1hcmsgdGhlIHNh dmVkIGZpbGUgYXMgcmVzb2x2ZWQuCitBIHZhbHVlIG9mIGBkZWZhdWx0JyBtZWFucyB0byB1 c2UgdGhlIHZhbHVlIG9mIGB2Yy1yZXNvbHZlLWNvbmZsaWN0cycuIgorICA6dHlwZSAnKGNo b2ljZSAoY29uc3QgOnRhZyAiRG9uJ3QgcmVzb2x2ZSIgbmlsKQorICAgICAgICAgICAgICAg ICAoY29uc3QgOnRhZyAiUmVzb2x2ZSIgdCkKKyAgICAgICAgICAgICAgICAgKGNvbnN0IDp0 YWcgIlVzZSB2Yy1yZXNvbHZlLWNvbmZsaWN0cyIgZGVmYXVsdCkpCisgIDp2ZXJzaW9uICIz MS4xIikKKwogDAogOzsgQ2xlYXIgdXAgdGhlIGNhY2hlIHRvIGZvcmNlIHZjLWNhbGwgdG8g Y2hlY2sgYWdhaW4gYW5kIGRpc2NvdmVyCiA7OyBuZXcgZnVuY3Rpb25zIHdoZW4gd2UgcmVs b2FkIHRoaXMgZmlsZS4KQEAgLTEyNjMsNyArMTI3MywxMCBAQCB2Yy1oZy1maW5kLWZpbGUt aG9vawogICAgIDs7IEhnIG1heSBub3QgcmVjb2duaXplICJjb25mbGljdCIgYXMgYSBzdGF0 ZSwgYnV0IHdlIGNhbiBkbyBiZXR0ZXIuCiAgICAgKHZjLWZpbGUtc2V0cHJvcCBidWZmZXIt ZmlsZS1uYW1lICd2Yy1zdGF0ZSAnY29uZmxpY3QpCiAgICAgKHNtZXJnZS1zdGFydC1zZXNz aW9uKQotICAgIChhZGQtaG9vayAnYWZ0ZXItc2F2ZS1ob29rICMndmMtaGctcmVzb2x2ZS13 aGVuLWRvbmUgbmlsIHQpCisgICAgKHdoZW4gKG9yIChlcSB2Yy1oZy1yZXNvbHZlLWNvbmZs aWN0cyB0KQorICAgICAgICAgICAgICAoYW5kIChlcSB2Yy1oZy1yZXNvbHZlLWNvbmZsaWN0 cyAnZGVmYXVsdCkKKyAgICAgICAgICAgICAgICAgICB2Yy1yZXNvbHZlLWNvbmZsaWN0cykp CisgICAgICAoYWRkLWhvb2sgJ2FmdGVyLXNhdmUtaG9vayAjJ3ZjLWhnLXJlc29sdmUtd2hl bi1kb25lIG5pbCB0KSkKICAgICAodmMtbWVzc2FnZS11bnJlc29sdmVkLWNvbmZsaWN0cyBi dWZmZXItZmlsZS1uYW1lKSkpCiAKIChkZWZ1biB2Yy1oZy1jbG9uZSAocmVtb3RlIGRpcmVj dG9yeSByZXYpCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLXN2bi5lbCBiL2xpc3AvdmMvdmMt c3ZuLmVsCmluZGV4IDQyMmVmNDhmOGMwLi43NmUyYjhiNWNhNiAxMDA2NDQKLS0tIGEvbGlz cC92Yy92Yy1zdm4uZWwKKysrIGIvbGlzcC92Yy92Yy1zdm4uZWwKQEAgLTEwNiw2ICsxMDYs MTYgQEAgdmMtc3ZuLWhlYWRlcgogICA6dmVyc2lvbiAiMjQuMSIgICAgIDsgbm8gbG9uZ2Vy IGNvbnN1bHQgdGhlIG9ic29sZXRlIHZjLWhlYWRlci1hbGlzdAogICA6dHlwZSAnKHJlcGVh dCBzdHJpbmcpKQogCisoZGVmY3VzdG9tIHZjLXN2bi1yZXNvbHZlLWNvbmZsaWN0cyAnZGVm YXVsdAorICAiV2hlbiBub24tbmlsLCBtYXJrIGNvbmZsaWN0ZWQgZmlsZSBhcyByZXNvbHZl ZCB1cG9uIHNhdmluZy4KK0lmIHRoaXMgaXMgbm9uLW5pbCBhbmQgdGhlcmUgYXJlIG5vIG1v cmUgY29uZmxpY3QgbWFya2VycyBpbiB0aGUgZmlsZSwKK1ZDIHdpbGwgbWFyayB0aGUgc2F2 ZWQgZmlsZSBhcyByZXNvbHZlZC4KK0EgdmFsdWUgb2YgYGRlZmF1bHQnIG1lYW5zIHRvIHVz ZSB0aGUgdmFsdWUgb2YgYHZjLXJlc29sdmUtY29uZmxpY3RzJy4iCisgIDp0eXBlICcoY2hv aWNlIChjb25zdCA6dGFnICJEb24ndCByZXNvbHZlIiBuaWwpCisgICAgICAgICAgICAgICAg IChjb25zdCA6dGFnICJSZXNvbHZlIiB0KQorICAgICAgICAgICAgICAgICAoY29uc3QgOnRh ZyAiVXNlIHZjLXJlc29sdmUtY29uZmxpY3RzIiBkZWZhdWx0KSkKKyAgOnZlcnNpb24gIjMx LjEiKQorCiA7OyBXZSB3YW50IHRvIGF1dG9sb2FkIGl0IGZvciB1c2UgYnkgdGhlIGF1dG9s b2FkZWQgdmVyc2lvbiBvZgogOzsgdmMtc3ZuLXJlZ2lzdGVyZWQsIGJ1dCB3ZSB3YW50IHRo ZSB2YWx1ZSB0byBiZSBjb21waWxlZCBhdCBzdGFydHVwLCBub3QKIDs7IGF0IGR1bXAgdGlt ZS4KQEAgLTY4OCw3ICs2OTgsMTAgQEAgdmMtc3ZuLWZpbmQtZmlsZS1ob29rCiAgICAgICAg IDs7IFRoZXJlIGFyZSBjb25mbGljdCBtYXJrZXJzLgogICAgICAgICAocHJvZ24KICAgICAg ICAgICAoc21lcmdlLXN0YXJ0LXNlc3Npb24pCi0gICAgICAgICAgKGFkZC1ob29rICdhZnRl ci1zYXZlLWhvb2sgIyd2Yy1zdm4tcmVzb2x2ZS13aGVuLWRvbmUgbmlsIHQpKQorICAgICAg ICAgICh3aGVuIChvciAoZXEgdmMtc3ZuLXJlc29sdmUtY29uZmxpY3RzIHQpCisgICAgICAg ICAgICAgIChhbmQgKGVxIHZjLXN2bi1yZXNvbHZlLWNvbmZsaWN0cyAnZGVmYXVsdCkKKyAg ICAgICAgICAgICAgICAgICB2Yy1yZXNvbHZlLWNvbmZsaWN0cykpCisgICAgICAgICAgICAo YWRkLWhvb2sgJ2FmdGVyLXNhdmUtaG9vayAjJ3ZjLXN2bi1yZXNvbHZlLXdoZW4tZG9uZSBu aWwgdCkpKQogICAgICAgOzsgVGhlcmUgYXJlIG5vIGNvbmZsaWN0IG1hcmtlcnMuICBUaGlz IGlzIHByb2JsZW1hdGljOiBtYXliZSBpdCBtZWFucwogICAgICAgOzsgdGhlIGNvbmZsaWN0 IGhhcyBiZWVuIHJlc29sdmVkIGFuZCB3ZSBzaG91bGQgaW1tZWRpYXRlbHkgY2FsbCAic3Zu CiAgICAgICA7OyByZXNvbHZlZCIsIG9yIGl0IG1lYW5zIHRoYXQgdGhlIGZpbGUncyB0eXBl IGRvZXMgbm90IGFsbG93IFN2biB0bwpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy5lbCBiL2xp c3AvdmMvdmMuZWwKaW5kZXggYmM5NjE3M2QxOTguLmRlMjJiMzAyNWNkIDEwMDY0NAotLS0g YS9saXNwL3ZjL3ZjLmVsCisrKyBiL2xpc3AvdmMvdmMuZWwKQEAgLTk5OSw2ICs5OTksMjEg QEAgdmMtY2xvbmUtaGV1cmlzdGljLWFsaXN0CiAgICAgICAgICAgICAgICAgOnZhbHVlLXR5 cGUgLHZjLWNsb25lYWJsZS1iYWNrZW5kcy1jdXN0b20tdHlwZSkKICAgOnZlcnNpb24gIjMx LjEiKQogCisoZGVmY3VzdG9tIHZjLXJlc29sdmUtY29uZmxpY3RzIHQKKyAgIldoZW4gbm9u LW5pbCwgbWFyayBjb25mbGljdGVkIGZpbGUgYXMgcmVzb2x2ZWQgdXBvbiBzYXZpbmcuCisK K0lmIHRoaXMgaXMgbm9uLW5pbCBhbmQgdGhlcmUgYXJlIG5vIG1vcmUgY29uZmxpY3QgbWFy a2VycyBpbiB0aGUgZmlsZSwKK1ZDIHdpbGwgbWFyayB0aGUgc2F2ZWQgZmlsZSBhcyByZXNv bHZlZC4gIFRoaXMgaXMgb25seSBtZWFuaW5nZnVsCitmb3IgVkNTIHRoYXQgaGFuZGxlIGNv bmZsaWN0cyBieSBpbnNlcnRpbmcgY29uZmxpY3QgbWFya2VycyBpbgorYSBjb25mbGljdGVk IGZpbGUuCisKK1doZW4gc2F2aW5nIGEgY29uZmxpY3RlZCBmaWxlLCBWQyBmaXJzdCB0cmll cyB0byB1c2UgdGhlIHZhbHVlCitvZiBgdmMtQkFDS0VORC1yZXNvbHZlLWNvbmZsaWN0cycs IGZvciBoYW5kbGluZyBiYWNrZW5kLXNwZWNpZmljCitzZXR0aW5ncy4gIEl0IGRlZmF1bHRz IHRvIHRoaXMgb3B0aW9uIGlmIHRoYXQgb3B0aW9uIGhhcyB0aGUgc3BlY2lhbAordmFsdWUg YGRlZmF1bHQnLiIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAgOnZlcnNpb24gIjMxLjEiKQorCiAM CiA7OyBGaWxlIHByb3BlcnR5IGNhY2hpbmcKIAotLSAKMi4zNC4xCgo= --------------3z7cQ0l2Gz85wSuAxV1HrCMu--
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 26 Jan 2021 00:28:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 25 19:28:33 2021 Received: from localhost ([127.0.0.1]:40440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l4CDh-00088r-6W for submit <at> debbugs.gnu.org; Mon, 25 Jan 2021 19:28:33 -0500 Received: from quimby.gnus.org ([95.216.78.240]:51298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1l4CDf-00088e-SQ for 3860 <at> debbugs.gnu.org; Mon, 25 Jan 2021 19:28:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dAJhB4ktUAqyKFFAnrTKc90hTuC8D+uJf8dbdOp3xlY=; b=bTxlU/ZIKpZ8takZXkeaHJU9w9 HMOSah7ngWBiqXpR7GXIvO5c+Gr7uc2GXM/eNN7AIhQLyrJOVqp0YkaOVOHcW5sEWJ7bLEIBa0Uau dSxUDAwLNPBSDfPxhpDx7xGFqgtuM2GkbHFXNgh9Hw9EYC1iJ4tmBMaR+H4jI8wFW46s=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1l4CDX-00039A-2M; Tue, 26 Jan 2021 01:28:25 +0100 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN> Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> <8d28786a01b6108e538ed5bec3c9094d.squirrel@HIDDEN> <b97c6da9-57b9-fba9-ed14-b542157a1ba7@HIDDEN> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAElBMVEVXSixFOiaOeD1t ZFIsJh/////yrKqJAAAAAWJLR0QF+G/pxwAAAAd0SU1FB+UBGgAMOAwuSUgAAAGiSURBVDjLbZML koMwCIbBeADYcgCbXsCtPUCY5f5nWkiiRqfp2Ix8+XlGQAIkRLguZMjvnNP2ztsFMNeNIPmPgHwd CmSkX/Z3f9DfuNkZtutSBg5PHI//Y3NsZlV8gL4slhLfgVgjDUDPw9OaLUQqg8JTQnLFO39cUn2B DSFKzot2X6BDjL+cXxqZ3YOXvGz2BWCZnqXVgiMgsWnByMuLZJDjPNljDw63rKYtP7WXCHamZT8p P+0biDqsp3UFsC1dIWBHEDGFvJyuzuhmUx4VdfcyUKys0mPswO1TN97Bmn/DhH1WFfiOtEwOCl2B sV+GaY55d19iTQE+lp85DNyDNOBjR0rSLAPwLm8vqIBtABFgnVYII30GoPXyMESMGmgHQvGNaD1c jiLroCCtguUOfJAuMG7g6AqIYq1KeL4qmDWq0lkD0Ogq+u3dq4BPoFIbp6hct1NhtIbzuYF1BGmu CpEoVk6gKRqWoF5OG4A9YqhKafGB2eDKr0DtkCYu+zwaUGpzLBJh/CPcgZQGPDU+qm8m7N2e/a6L DmBfqO7IFX7uH3vLsHede+JSAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTAxLTI2VDAwOjEyOjU1 KzAwOjAwlFhVdwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0wMS0yNlQwMDoxMjo1NSswMDowMOUF 7csAAAAASUVORK5CYII= X-Now-Playing: Bobbie Gentry's _The Girl From Chickasaw County (2): The Delta Sweete_: "Jessye' Lisabeth" Date: Tue, 26 Jan 2021 01:28:21 +0100 In-Reply-To: <b97c6da9-57b9-fba9-ed14-b542157a1ba7@HIDDEN> (Dmitry Gutov's message of "Mon, 25 Jan 2021 03:57:06 +0200") Message-ID: <87ft2omti2.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov <dgutov@HIDDEN> writes: > But the current behavior of that variable and its default value have > been requested by Emacs maintainers, one former and one current. As > such, I'll let the maintainers decide on whether the defa [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN, James Y Knight <jknight@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Dmitry Gutov <dgutov@HIDDEN> writes: > But the current behavior of that variable and its default value have > been requested by Emacs maintainers, one former and one current. As > such, I'll let the maintainers decide on whether the default can be > changed here. I have found the way Emacs handles conflicts somewhat confusing a few times, but I'm not sure whether this is due to the automatic resolving or not. I'll try to pay more attention next time. :-/ -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 25 Jan 2021 01:57:17 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 24 20:57:17 2021 Received: from localhost ([127.0.0.1]:37557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l3r81-0005uH-Ec for submit <at> debbugs.gnu.org; Sun, 24 Jan 2021 20:57:17 -0500 Received: from mail-ed1-f43.google.com ([209.85.208.43]:43272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <raaahh@HIDDEN>) id 1l3r7z-0005u3-Lz for 3860 <at> debbugs.gnu.org; Sun, 24 Jan 2021 20:57:16 -0500 Received: by mail-ed1-f43.google.com with SMTP id n6so13326483edt.10 for <3860 <at> debbugs.gnu.org>; Sun, 24 Jan 2021 17:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Dt9BdAWqnGB4/z1sDRgGDKN0jFXD+/d+O3NdOTJCqyw=; b=IovQi6fqR9MVK+exvcu2JcxkO8hVBSyfSea2GGQng1y1JR6zKT/IjD97MLugHPqQZ6 mOlSxGr35wiUzML/zrwHlHJrlbMqdIfhWbK2/JgwD04GpxwGgQWbaMHjg53rOX5+y9fQ g7NW23k+foiUd/KrTgtwfmK1jjlWEDKQBrFMnOm6zjU0IZyn50zEebBV4QELt2Z9MT5n YcLFdr5e7mWHI3UC580G3h5Sz7XY4D4zjNYRTQiFd3DU3rbzR515bWV5fwIAfzA9GY9p tZ7fRVZvDU9guSINntZtKT8vS89K78Tqz61HpJsOz5rupYPl1oOD/NrBIE+bbMmrlRxx NUaQ== 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=Dt9BdAWqnGB4/z1sDRgGDKN0jFXD+/d+O3NdOTJCqyw=; b=ViuvhyJ/gGrFbZO9HBLKTtcTrvsqjvN+9VtF0BYcW2Za5tBUm9V35EmzWYLCXO5lzi 1fB0VJW35tckYmpiDbwcQ+35QnWZLk21pLihfO9RRlrVnlfifDJAmVDjJLxbFF+9A9Sr fsclu2zATm2s6drNN/lEqEtkmzCtwp8aVaMfr71rsHj8qUT8rGSu5Wlo7+0dvJhP+RO2 /SYClz6qsG/899FJ7NRxy4BVvkfbEi0ZzkMayZ8XHySzbF4tkWgggEo2+HvcLmqDRxPI hs2pjsYXGPzcSzt7YaT4bzgUKMC58S/UDCoY3/ior8H6slzN68p7jxhW/Q272m08dNkK Xsww== X-Gm-Message-State: AOAM533ceCx0qRCAdyUK2TOxEJnn62XPJaqVLgigEh5/C6v4iWkfbC64 P3mkJVU5m8O25TGU45rtSdo= X-Google-Smtp-Source: ABdhPJwSbNzkjLWbcaBwiPwVnpmBsUYhnzvD0i0bNemDKhPnQyipqWr2HzuT88/zHRxGjhwfuiwBHg== X-Received: by 2002:aa7:c44f:: with SMTP id n15mr413550edr.150.1611539829684; Sun, 24 Jan 2021 17:57:09 -0800 (PST) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id w16sm9938257edv.4.2021.01.24.17.57.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 24 Jan 2021 17:57:08 -0800 (PST) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: James Y Knight <jknight@HIDDEN>, Lars Ingebrigtsen <larsi@HIDDEN> References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> <8d28786a01b6108e538ed5bec3c9094d.squirrel@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <b97c6da9-57b9-fba9-ed14-b542157a1ba7@HIDDEN> Date: Mon, 25 Jan 2021 03:57:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <8d28786a01b6108e538ed5bec3c9094d.squirrel@HIDDEN> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) On 25.01.2021 00:36, James Y Knight wrote: > I haven't used svn in years at this point, so I really don't care what > happens with vc-svn anymore. But I had personally long ago worked around > this bug with: > (defadvice vc-svn-resolve-when-done (around dont-svn-resolve activate) > nil) Fair enough. > However, I will mention that I find the equivalent behavior in Emacs's Git > integration just as bad -- for the same reason of it discarding important > information! There's a reason that "git add" is a separate operation, and > having emacs silently run that when doing a "save" operation destroys > information, unexpectedly. > > I really think this behavior should _never_ have been made default > behavior in _any_ VC mode. Discarding data is quite a bad default, and > extremely unexpected from "save". But, hey, at least vc-git can be > configured, so that's nice. > > (And, I'll note that it took me at least a _year_ to figure out that the > broken behavior after resolving conflicts in Git was an emacs vc-git bug, > and not Git itself having lost the ability to 3-way-conflict-diff the > conflict resolution! It's incredibly non-obvious that emacs is breaking > this!) > > I'm not the only one to complain about this, e.g. > https://emacs.stackexchange.com/questions/51206/disabling-automatic-add-after-resolving-git-conflict > > For that matter, bug 20292 which added the emacs config option has > multiple complaints about this behavior, as well... "Multiple complaints" seems to be an overstatement: we have one question of SE, and one disagreement in the bug comments. The disagreement is from the current Git maintainer, which is significant, but still not a gospel, since VC tries to provide a "unified" interface to many VCSes, not just Git. That said, I personally customize vc-git-resolve-conflicts to nil, and 'C-x v v' now does resolve the conflicts all right (even though it doesn't refresh the vc-state of such buffers automatically). So nil works okay, and it would be my vote. But the current behavior of that variable and its default value have been requested by Emacs maintainers, one former and one current. As such, I'll let the maintainers decide on whether the default can be changed here.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 25 Jan 2021 01:08:52 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 24 20:08:52 2021 Received: from localhost ([127.0.0.1]:37547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l3qNA-0004nn-C9 for submit <at> debbugs.gnu.org; Sun, 24 Jan 2021 20:08:52 -0500 Received: from outgoing.fuhm.net ([45.79.218.44]:49778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jknight@HIDDEN>) id 1l3nzk-0001Dh-2y for 3860 <at> debbugs.gnu.org; Sun, 24 Jan 2021 17:36:32 -0500 Received: from localhost ([127.0.0.1] helo=fuhm.net) by torpor.static.net with esmtp (Exim 4.92) (envelope-from <jknight@HIDDEN>) id 1l3nze-0006V1-VV; Sun, 24 Jan 2021 17:36:27 -0500 Received: from 10.0.1.211 (SquirrelMail authenticated user jknight) by fuhm.net with HTTP; Sun, 24 Jan 2021 17:36:27 -0500 Message-ID: <8d28786a01b6108e538ed5bec3c9094d.squirrel@HIDDEN> In-Reply-To: <87k0s66y57.fsf@HIDDEN> References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> Date: Sun, 24 Jan 2021 17:36:27 -0500 Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission From: "James Y Knight" <jknight@HIDDEN> To: "Lars Ingebrigtsen" <larsi@HIDDEN> User-Agent: SquirrelMail/1.4.23 [SVN] MIME-Version: 1.0 Content-Type: text/plain;charset=UTF-8 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 X-Mailman-Approved-At: Sun, 24 Jan 2021 20:08:47 -0500 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On Thu, January 21, 2021 11:41 am, Lars Ingebrigtsen wrote: > James Y Knight <jknight@HIDDEN> writes: > >> Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on >> Debian Lenny), and was a bit disappointed to discover that vc-svn is >> now automatically calling "svn resolved" on files when I save them >> after removing conflict markers. > > (I'm going through old bug reports that unfortunately got no response at > the time.) > > This behaviour still seems to be present in Emacs 28, as far as I can > see. > >> I use svn's list of conflicted files while working on merges, and tend >> to only call "resolved" on them when I'm *actually done* fixing a >> group of files. I'll note that emacs automatically calling "svn >> resolved" also destroys the .mine, .rOLD, and .rNEW files, which I >> wasn't actually done with yet. Having them disappear out from under me >> just because I've *partly* fixed things and saved is very >> counterintuitive! > > I haven't used SVN myself in ages, and I don't even recall what my work > flow used to be. However, adding a variable to suppress > `vc-svn-resolve-when-done' might make sense? Anybody who actually uses > SVN still got an opinion here? > > That this bug report is 11 years old and there doesn't seem to be any > other bug reports about this does perhaps indicate that people are fine > with how it works, and nothing should be done here. I haven't used svn in years at this point, so I really don't care what happens with vc-svn anymore. But I had personally long ago worked around this bug with: (defadvice vc-svn-resolve-when-done (around dont-svn-resolve activate) nil) However, I will mention that I find the equivalent behavior in Emacs's Git integration just as bad -- for the same reason of it discarding important information! There's a reason that "git add" is a separate operation, and having emacs silently run that when doing a "save" operation destroys information, unexpectedly. I really think this behavior should _never_ have been made default behavior in _any_ VC mode. Discarding data is quite a bad default, and extremely unexpected from "save". But, hey, at least vc-git can be configured, so that's nice. (And, I'll note that it took me at least a _year_ to figure out that the broken behavior after resolving conflicts in Git was an emacs vc-git bug, and not Git itself having lost the ability to 3-way-conflict-diff the conflict resolution! It's incredibly non-obvious that emacs is breaking this!) I'm not the only one to complain about this, e.g. https://emacs.stackexchange.com/questions/51206/disabling-automatic-add-after-resolving-git-conflict For that matter, bug 20292 which added the emacs config option has multiple complaints about this behavior, as well...
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 3860) by debbugs.gnu.org; 22 Jan 2021 17:25:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 22 12:25:21 2021 Received: from localhost ([127.0.0.1]:32959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l30BU-0000Dd-VX for submit <at> debbugs.gnu.org; Fri, 22 Jan 2021 12:25:21 -0500 Received: from quimby.gnus.org ([95.216.78.240]:43020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1l30BS-0000DL-61 for 3860 <at> debbugs.gnu.org; Fri, 22 Jan 2021 12:25:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X6KknwBTxPhXuobzsVQpmwprCq41simtvsSdnJPZQRk=; b=lyn/a8Ni2jNqwzVOFa1xQn4ocf yShRk5cx8dInIfH7JH+mh6fadIT4IW8sPX9tVXMU+N3GoK4V1EhEoZ0EmnwPdGgpb/flaw9zcvAbM y5pVOsem6Ax7/yClRK/vdXQsKn8c14ChRoe4SaoWi6tsR+7E+dLbmPnf9s/9/mb98Nyo=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1l30BG-00031B-Ln; Fri, 22 Jan 2021 18:25:12 +0100 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN> Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> <835z3q6q6q.fsf@HIDDEN> <6b6005b6-6efc-63f1-404d-d07f910281ef@HIDDEN> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAFVBMVEXf8/whX6KOttql 1voWOWRVoe7////Vi6ViAAAAAWJLR0QGYWa4fQAAAAd0SU1FB+UBFhEOF8L7YGwAAAGESURBVDjL dZRBjsMgDEWROIGlsp8asUdYPUCkzgEC8v2vMtiGkCgZL2jL0/e3HafO/RfQA0kiX8G3R2glMdMN bBx9V7gn4G73AkBAfgChp/cPik0APYKW3a3aDiCQpwewAWt/t3IBuD52vkFgjmeJP4GKS+JdXkA1 A+SjKhjATeBHH5preXiTSoOBSzuVS0cffAGHuXhTO3c4gFife88mU/CJZQE1965b1GrbQH4NREFL GL3PJnln9IjVFJiqHyZ+g+/+hd8OAmPEJPVqbkIs5SeSLFx3T1ivT0QBhJ2DlDzuRGlAomLM1oMO UUHYJV+jMVbFw0OPOFz88JCJiCzitM8K+q/Ekq7NoehSkn7RVFhjIrfMhSqI/RWJVlW+gMYcGi1z OaTckHgP9lYt2kHQ2rjNkRSBHxHUpDiOx5Hk2E+Abd2Ixz1Yl/KRrQNX9B44KQi2k1R4Tjfwvk3S 0WeCl2WyZMzIu4KXbPY2pRowwSZ/HUsD4LDHGy6haa2dMjbueOqIf76IgMegAsrxAAAAJXRFWHRk YXRlOmNyZWF0ZQAyMDIxLTAxLTIyVDE3OjE0OjIzKzAwOjAwxB6yugAAACV0RVh0ZGF0ZTptb2Rp ZnkAMjAyMS0wMS0yMlQxNzoxNDoyMyswMDowMLVDCgYAAAAASUVORK5CYII= X-Now-Playing: Pulse's _Remix_: "A River Dry (The Girl From South)" Date: Fri, 22 Jan 2021 18:25:05 +0100 In-Reply-To: <6b6005b6-6efc-63f1-404d-d07f910281ef@HIDDEN> (Dmitry Gutov's message of "Fri, 22 Jan 2021 00:35:07 +0200") Message-ID: <87y2gk28b2.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov <dgutov@HIDDEN> writes: > So someone might want to generalize the Git-specific variable: > vc-git-resolve-conflicts. Yeah, makes sense. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, spiegel@HIDDEN, jknight@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Dmitry Gutov <dgutov@HIDDEN> writes: > So someone might want to generalize the Git-specific variable: > vc-git-resolve-conflicts. Yeah, makes sense. > But they'd have to consider what to do with the special value > 'unstage-maybe', which doesn't really make sense for other backends. Yup. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 22 Jan 2021 07:29:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 22 02:29:32 2021 Received: from localhost ([127.0.0.1]:59954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l2qsu-0008VC-J7 for submit <at> debbugs.gnu.org; Fri, 22 Jan 2021 02:29:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1l2qst-0008Uz-80 for 3860 <at> debbugs.gnu.org; Fri, 22 Jan 2021 02:29:31 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59347) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1l2qsn-0000Oj-7l; Fri, 22 Jan 2021 02:29:25 -0500 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2632 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <eliz@HIDDEN>) id 1l2qsl-0006QH-Vm; Fri, 22 Jan 2021 02:29:24 -0500 Date: Fri, 22 Jan 2021 09:29:22 +0200 Message-Id: <83r1md5t0t.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN> In-Reply-To: <6b6005b6-6efc-63f1-404d-d07f910281ef@HIDDEN> (message from Dmitry Gutov on Fri, 22 Jan 2021 00:35:07 +0200) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> <835z3q6q6q.fsf@HIDDEN> <6b6005b6-6efc-63f1-404d-d07f910281ef@HIDDEN> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, larsi@HIDDEN, spiegel@HIDDEN, jknight@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > Cc: 3860 <at> debbugs.gnu.org, jknight@HIDDEN, spiegel@HIDDEN > From: Dmitry Gutov <dgutov@HIDDEN> > Date: Fri, 22 Jan 2021 00:35:07 +0200 > > On 21.01.2021 21:33, Eli Zaretskii wrote: > > I think if we are going to make this optional with SVN, we should make > > it optional with the other back-ends as well. VC always presented a > > uniform UI and user experience with all back-ends, as far as possible > > and reasonable. In this case, I think automatically marking the > > conflicts as resolved makes a lot of sense, but I won't object to make > > it opt-out, as long as it's done for every VCS that can support it. > > So someone might want to generalize the Git-specific variable: > vc-git-resolve-conflicts. Yes, I think so. > But they'd have to consider what to do with the special value > 'unstage-maybe', which doesn't really make sense for other backends. Right.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 22:35:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 21 17:35:18 2021 Received: from localhost ([127.0.0.1]:59628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l2iXt-00048T-NM for submit <at> debbugs.gnu.org; Thu, 21 Jan 2021 17:35:17 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:35643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <raaahh@HIDDEN>) id 1l2iXs-00048E-Aw for 3860 <at> debbugs.gnu.org; Thu, 21 Jan 2021 17:35:16 -0500 Received: by mail-wm1-f49.google.com with SMTP id e15so2819438wme.0 for <3860 <at> debbugs.gnu.org>; Thu, 21 Jan 2021 14:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=nDVcWQTltM/CKzRNRnsz3eTARuKNwBMpQj1tP7Boj30=; b=gsjSKJkNdDJtlFl08plcOi3kt461qAmomk3clURONio7KU/etXhtOSK7TY6HEmBf52 rRGkbfpR0xwhu2V/uz9r4XxI5NKQMY9wAv5Wc3fodJMqz8LGV7O62rHyHf9Jj5oG4yAs lrRjNw2Q1BOMFFZLL3gYwNW20h5ImQo4Fgv44s8VMhw+/4athnnX65wKuzd6yWGCydmT mMJrVrxO9vZeclOhnEk/NNsOuEUPs7XAauPa+evC055ihnYZksNwrqboPHu2dpjNpdqP GYfbhJpR9lk/qHgLJ3Qef9GBhVDbfXwabJRZ1k23tVO+SdMltUh+pWSa4vNzzSAFVAoT WqCA== 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=nDVcWQTltM/CKzRNRnsz3eTARuKNwBMpQj1tP7Boj30=; b=uBo8rYHvr9obZYwC4/q5ftc+DKjiyr6kk0IiaXYVKmH2l+5TtbElPzTFEdUtYoMgjw 9Vzr5PtJK0nWnpeR0Hp0Lm4wNo1oQ/GeVOSB1Nlopoy8iQ10rHG03HWTZfA/7fPm3gmU m5wzyA46TZstBDEb39c+UZl1+L3sgC1U1Ug2K2im99AyiW+T5EUR/OGVFW61Hb6rSXwL Zh471WLvASuiqGEoJSqByvkPd5AluKmXZQGwUv9+RoG5j0rRsl594wzi6Hj9cNkITd00 iEmj6YhEUcHcMiRrCGwLrwibwamioUEIVsC/c0j4J8aBwq16FLQ5VtAkmjzLL+GBjg4l gH3A== X-Gm-Message-State: AOAM530pdgsR63J0Qcv33tVDMWuA4M72L8i62YJXsSeC7XhI95SXbn+s TkK2sHwW1U1y4YypvdWw83c= X-Google-Smtp-Source: ABdhPJxQygX6wyoeucVylxkVhnQtZpSS5cDgGeH4jzPM8zl8duZnC6/ebN9PHiTkYIKkeLaWa0Oxgw== X-Received: by 2002:a1c:f70c:: with SMTP id v12mr1217985wmh.77.1611268510489; Thu, 21 Jan 2021 14:35:10 -0800 (PST) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id q2sm9408179wma.6.2021.01.21.14.35.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Jan 2021 14:35:09 -0800 (PST) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission To: Eli Zaretskii <eliz@HIDDEN>, Lars Ingebrigtsen <larsi@HIDDEN> References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> <835z3q6q6q.fsf@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <6b6005b6-6efc-63f1-404d-d07f910281ef@HIDDEN> Date: Fri, 22 Jan 2021 00:35:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <835z3q6q6q.fsf@HIDDEN> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN, jknight@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) On 21.01.2021 21:33, Eli Zaretskii wrote: > I think if we are going to make this optional with SVN, we should make > it optional with the other back-ends as well. VC always presented a > uniform UI and user experience with all back-ends, as far as possible > and reasonable. In this case, I think automatically marking the > conflicts as resolved makes a lot of sense, but I won't object to make > it opt-out, as long as it's done for every VCS that can support it. So someone might want to generalize the Git-specific variable: vc-git-resolve-conflicts. But they'd have to consider what to do with the special value 'unstage-maybe', which doesn't really make sense for other backends.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 19:33:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 21 14:33:13 2021 Received: from localhost ([127.0.0.1]:59411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l2fhh-0007w0-08 for submit <at> debbugs.gnu.org; Thu, 21 Jan 2021 14:33:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1l2fhf-0007vo-Bw for 3860 <at> debbugs.gnu.org; Thu, 21 Jan 2021 14:33:11 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48640) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1l2fhZ-0007sa-Oh; Thu, 21 Jan 2021 14:33:05 -0500 Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2554 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <eliz@HIDDEN>) id 1l2fhY-0004tx-K9; Thu, 21 Jan 2021 14:33:05 -0500 Date: Thu, 21 Jan 2021 21:33:01 +0200 Message-Id: <835z3q6q6q.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Lars Ingebrigtsen <larsi@HIDDEN> In-Reply-To: <87k0s66y57.fsf@HIDDEN> (message from Lars Ingebrigtsen on Thu, 21 Jan 2021 17:41:08 +0100) Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> <87k0s66y57.fsf@HIDDEN> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN, jknight@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) > From: Lars Ingebrigtsen <larsi@HIDDEN> > Date: Thu, 21 Jan 2021 17:41:08 +0100 > Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN > > > I use svn's list of conflicted files while working on merges, and tend > > to only call "resolved" on them when I'm *actually done* fixing a > > group of files. I'll note that emacs automatically calling "svn > > resolved" also destroys the .mine, .rOLD, and .rNEW files, which I > > wasn't actually done with yet. Having them disappear out from under me > > just because I've *partly* fixed things and saved is very > > counterintuitive! > > I haven't used SVN myself in ages, and I don't even recall what my work > flow used to be. However, adding a variable to suppress > `vc-svn-resolve-when-done' might make sense? Anybody who actually uses > SVN still got an opinion here? I think if we are going to make this optional with SVN, we should make it optional with the other back-ends as well. VC always presented a uniform UI and user experience with all back-ends, as far as possible and reasonable. In this case, I think automatically marking the conflicts as resolved makes a lot of sense, but I won't object to make it opt-out, as long as it's done for every VCS that can support it.
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 16:41:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 21 11:41:21 2021 Received: from localhost ([127.0.0.1]:59201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1l2d1N-0001e7-8g for submit <at> debbugs.gnu.org; Thu, 21 Jan 2021 11:41:21 -0500 Received: from quimby.gnus.org ([95.216.78.240]:59402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1l2d1K-0001dr-QL for 3860 <at> debbugs.gnu.org; Thu, 21 Jan 2021 11:41:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QrvDc9MDFVLXix8nXLLfrz761UjVl8ptS/p2mYLQ0Ao=; b=mgMgV0sqVGyCiek2lT0m2ukT4x 7kd8HueDrEdGA8a/1gglIwiVKuBOAkWKqwzycdg4pTIwfU1Q3SzvaFy8jWFwysrg88a8UyUpO+CBq 3CePGAa/+tToICgM0/OhNycP9FeZJ9WPsn/435SmTyg5jEoW86sE3CKTKlPmg0Ys1iuQ=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1l2d1B-00070L-JL; Thu, 21 Jan 2021 17:41:11 +0100 From: Lars Ingebrigtsen <larsi@HIDDEN> To: James Y Knight <jknight@HIDDEN> Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission References: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> X-Now-Playing: Voice Farm's _Third Noise Principle (Formative North American Electronica 1975-1984) (1)_: "AM City" Date: Thu, 21 Jan 2021 17:41:08 +0100 In-Reply-To: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> (James Y. Knight's message of "Wed, 15 Jul 2009 15:43:06 -0400") Message-ID: <87k0s66y57.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: James Y Knight <jknight@HIDDEN> writes: > Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on > Debian Lenny), and was a bit disappointed to discover that vc-svn is > now automatically calling "svn resolved" on files when [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 3860 Cc: 3860 <at> debbugs.gnu.org, spiegel@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) James Y Knight <jknight@HIDDEN> writes: > Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on > Debian Lenny), and was a bit disappointed to discover that vc-svn is > now automatically calling "svn resolved" on files when I save them > after removing conflict markers. (I'm going through old bug reports that unfortunately got no response at the time.) This behaviour still seems to be present in Emacs 28, as far as I can see. > I use svn's list of conflicted files while working on merges, and tend > to only call "resolved" on them when I'm *actually done* fixing a > group of files. I'll note that emacs automatically calling "svn > resolved" also destroys the .mine, .rOLD, and .rNEW files, which I > wasn't actually done with yet. Having them disappear out from under me > just because I've *partly* fixed things and saved is very > counterintuitive! I haven't used SVN myself in ages, and I don't even recall what my work flow used to be. However, adding a variable to suppress `vc-svn-resolve-when-done' might make sense? Anybody who actually uses SVN still got an opinion here? That this bug report is 11 years old and there doesn't seem to be any other bug reports about this does perhaps indicate that people are fine with how it works, and nothing should be done here. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#3860; Package emacs.
Full text available.Received: (at submit) by emacsbugs.donarmstrong.com; 15 Jul 2009 20:26:04 +0000 From jknight@HIDDEN Wed Jul 15 13:26:04 2009 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.0 required=4.0 tests=none autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n6FKPv7L029953 for <submit@HIDDEN>; Wed, 15 Jul 2009 13:25:58 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRB33-0008EA-Ir for bug-gnu-emacs@HIDDEN; Wed, 15 Jul 2009 16:25:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRB2y-0008Be-Oq for bug-gnu-emacs@HIDDEN; Wed, 15 Jul 2009 16:25:52 -0400 Received: from [199.232.76.173] (port=58279 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRB2y-0008Bb-KB for bug-gnu-emacs@HIDDEN; Wed, 15 Jul 2009 16:25:48 -0400 Received: from 207-172-212-176.c3-0.smr-ubr2.sbo-smr.ma.static.cable.rcn.com ([207.172.212.176]:42252 helo=torpor.static.net) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from <jknight@HIDDEN>) id 1MRB2v-00039V-Ay; Wed, 15 Jul 2009 16:25:45 -0400 Received: from ita4fw1.itasoftware.com ([63.107.91.99] helo=dc4-9dhcp19047.internal.itasoftware.com) by torpor.static.net with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.63) (envelope-from <jknight@HIDDEN>) id 1MRANf-00049G-S6; Wed, 15 Jul 2009 15:43:09 -0400 Message-Id: <DF0D6AAB-D0C4-4846-AF6B-1AC9586F8A95@HIDDEN> From: James Y Knight <jknight@HIDDEN> To: spiegel@HIDDEN, bug-gnu-emacs@HIDDEN Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v935.3) Subject: vc-svn calls "svn resolved" without permission Date: Wed, 15 Jul 2009 15:43:06 -0400 X-Mailer: Apple Mail (2.935.3) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-Greylist: delayed 2554 seconds by postgrey-1.27 at monty-python; Wed, 15 Jul 2009 16:25:44 EDT X-Greylist: delayed 2555 seconds by postgrey-1.27 at monty-python; Wed, 15 Jul 2009 16:25:45 EDT Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on Debian Lenny), and was a bit disappointed to discover that vc-svn is now automatically calling "svn resolved" on files when I save them after removing conflict markers. I use svn's list of conflicted files while working on merges, and tend to only call "resolved" on them when I'm *actually done* fixing a group of files. I'll note that emacs automatically calling "svn resolved" also destroys the .mine, .rOLD, and .rNEW files, which I wasn't actually done with yet. Having them disappear out from under me just because I've *partly* fixed things and saved is very counterintuitive! There's a reason that svn makes you run "svn resolved" on files to note them as resolved instead of just checking for the lack of conflict markers, and vc-svn is totally destroying that nice behavior of svn. If it was a good idea to autoresolve when there's no conflict marker in the file, then "svn commit" would already do that! IMO, the function "vc-svn-resolve-when-done" should just be removed entirely. But if not, it really should *at least* be asking for confirmation first before causing the merge working data to be deleted. Relatedly, it would also be great if there was a key to run svn resolved. I've had this addition in my .emacs for a while to achieve that: (defun svn-resolved () "Resolve conflict on current buffer" (interactive) (shell-command (concat "svn resolved " (buffer-file-name)))) (define-key 'vc-prefix-map "R" 'svn-resolved) James
James Y Knight <jknight@HIDDEN>:Emacs Bugs <bug-gnu-emacs@HIDDEN>.
Full text available.bug-submit-list@HIDDEN, Emacs Bugs <bug-gnu-emacs@HIDDEN>:bug#3860; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.