From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Tue, 26 Jan 2021 01:28:21 +0100 Message-ID: <87ft2omti2.fsf@gnus.org> References: <87k0s66y57.fsf@gnus.org> <8d28786a01b6108e538ed5bec3c9094d.squirrel@fuhm.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10794"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 3860@debbugs.gnu.org, James Y Knight , spiegel@gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 26 01:29:15 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l4CEM-0002hp-NY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Jan 2021 01:29:14 +0100 Original-Received: from localhost ([::1]:52758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4CEL-0004Og-Pu for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 25 Jan 2021 19:29:13 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4CEA-0004NK-1I for bug-gnu-emacs@gnu.org; Mon, 25 Jan 2021 19:29:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:57133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4CE9-00085u-Qb for bug-gnu-emacs@gnu.org; Mon, 25 Jan 2021 19:29:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4CE9-00089r-NC for bug-gnu-emacs@gnu.org; Mon, 25 Jan 2021 19:29:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Jan 2021 00:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 3860 X-GNU-PR-Package: emacs Original-Received: via spool by 3860-submit@debbugs.gnu.org id=B3860.161162091331306 (code B ref 3860); Tue, 26 Jan 2021 00:29:01 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 26 Jan 2021 00:28:33 +0000 Original-Received: from localhost ([127.0.0.1]:40440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4CDh-00088r-6W for submit@debbugs.gnu.org; Mon, 25 Jan 2021 19:28:33 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:51298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4CDf-00088e-SQ for 3860@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=; Original-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 ) id 1l4CDX-00039A-2M; Tue, 26 Jan 2021 01:28:25 +0100 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" In-Reply-To: (Dmitry Gutov's message of "Mon, 25 Jan 2021 03:57:06 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198605 Archived-At: Dmitry Gutov 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