From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Sun, 19 Apr 2015 21:38:13 +0300 Message-ID: <83mw2455gq.fsf@gnu.org> References: <83fv88ta5r.fsf@gnu.org> <5532ADA3.5000006@yandex.ru> <834mod6xnm.fsf@gnu.org> <5532D397.8090602@yandex.ru> <83zj645gxu.fsf@gnu.org> <5533D7B8.7060508@yandex.ru> <83sibw59q1.fsf@gnu.org> <5533E816.2090208@yandex.ru> <83r3rg56zy.fsf@gnu.org> <5533EFE5.2050101@yandex.ru> <83oamk561p.fsf@gnu.org> <5533F446.4020400@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429468760 20113 80.91.229.3 (19 Apr 2015 18:39:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 19 Apr 2015 18:39:20 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 19 20:39:10 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yju7a-0008Dr-BO for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 20:39:10 +0200 Original-Received: from localhost ([::1]:49340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yju7Z-0002j7-OK for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 14:39:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yju7W-0002j1-1O for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:39:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yju7S-0004cV-SH for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:39:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yju7S-0004cE-OU for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:39:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yju7R-0003kf-WA for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 14:39:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Apr 2015 18:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20292-submit@debbugs.gnu.org id=B20292.142946871014380 (code B ref 20292); Sun, 19 Apr 2015 18:39:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 19 Apr 2015 18:38:30 +0000 Original-Received: from localhost ([127.0.0.1]:60901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yju6w-0003js-2b for submit@debbugs.gnu.org; Sun, 19 Apr 2015 14:38:30 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:58274) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yju6u-0003jb-9g for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 14:38:29 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NN200900GQB9100@mtaout29.012.net.il> for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 21:36:38 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN200PQJH126290@mtaout29.012.net.il>; Sun, 19 Apr 2015 21:36:38 +0300 (IDT) In-reply-to: <5533F446.4020400@yandex.ru> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:101737 Archived-At: > Date: Sun, 19 Apr 2015 21:30:30 +0300 > From: Dmitry Gutov > CC: esr@snark.thyrsus.com, 20292@debbugs.gnu.org > > On 04/19/2015 09:25 PM, Eli Zaretskii wrote: > > > If we can, yes. If not, this is way out of scope of the bug report. > > Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63? IMO, it's too radical: there's no need to avoid turning on smerge-mode, as it is useful for conflict resolution. "git add" is not run by smerge-mode, it is run by vc-git-resolve-when-done, so it should be enough to avoid adding that to after-save-hook, I think. Thanks.