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: Fri, 22 Jan 2021 18:25:05 +0100 Message-ID: <87y2gk28b2.fsf@gnus.org> References: <87k0s66y57.fsf@gnus.org> <835z3q6q6q.fsf@gnu.org> <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39285"; 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, jknight@fuhm.net, spiegel@gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 22 18:26:30 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 1l30Cb-000A3z-8E for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 18:26:29 +0100 Original-Received: from localhost ([::1]:54134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l30Ca-0001fn-2j for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 12:26:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l30CA-0001a4-Vo for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 12:26:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l30CA-00052R-3s for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 12:26:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l30CA-0000En-0S for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 12:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Jan 2021 17:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 3860 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 3860-submit@debbugs.gnu.org id=B3860.1611336321849 (code B ref 3860); Fri, 22 Jan 2021 17:26:01 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 22 Jan 2021 17:25:21 +0000 Original-Received: from localhost ([127.0.0.1]:32959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l30BU-0000Dd-VX for submit@debbugs.gnu.org; Fri, 22 Jan 2021 12:25:21 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:43020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l30BS-0000DL-61 for 3860@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=; 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 1l30BG-00031B-Ln; Fri, 22 Jan 2021 18:25:12 +0100 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)" In-Reply-To: <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> (Dmitry Gutov's message of "Fri, 22 Jan 2021 00:35:07 +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:198380 Archived-At: Dmitry Gutov 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