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.