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: Thu, 14 May 2015 22:33:20 +0300 Message-ID: <83fv6zhs3j.fsf@gnu.org> References: <83fv88ta5r.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> <83fv7u6epr.fsf@gnu.org> <838udm61ur.fsf@gnu.org> <5536FE56.406@yandex.ru> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.fsf@gnu.org> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@gnu.org> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.fsf@gnu.org> <5554F2F3.6010109@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431632067 14781 80.91.229.3 (14 May 2015 19:34:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 19:34:27 +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 Thu May 14 21:34:16 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 1Ysytc-0005LE-BM for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 21:34:16 +0200 Original-Received: from localhost ([::1]:56520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ysytb-0003ID-Az for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 15:34:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsytW-0003I7-6t for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:34:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsytO-0001AP-Eh for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:34:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsytO-0001A8-Cf for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsytO-00033V-2O for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:34: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: Thu, 14 May 2015 19:34:02 +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.143163201411708 (code B ref 20292); Thu, 14 May 2015 19:34:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 19:33:34 +0000 Original-Received: from localhost ([127.0.0.1]:45399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ysysv-00032l-QV for submit@debbugs.gnu.org; Thu, 14 May 2015 15:33:34 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:54719) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ysyst-00032X-7A for 20292@debbugs.gnu.org; Thu, 14 May 2015 15:33:32 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NOC00M00U52ZU00@a-mtaout20.012.net.il> for 20292@debbugs.gnu.org; Thu, 14 May 2015 22:33:23 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOC00M9HUBMXZ30@a-mtaout20.012.net.il>; Thu, 14 May 2015 22:33:23 +0300 (IDT) In-reply-to: <5554F2F3.6010109@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:102806 Archived-At: > Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org > From: Dmitry Gutov > Date: Thu, 14 May 2015 22:09:39 +0300 > > On 05/14/2015 09:52 PM, Eli Zaretskii wrote: > > > I think its a good idea. > > It might be. But I don't actually know how to approach it. > > Doing 'git reset' right after a stash is popped would break > vc-git-conflicted-files. > > If we don't do that, then what else *do* we do in vc-git-stash-apply and > vc-git-stash-pop? Ask the user whether to reset each file in the index (other than the one in which the conflicts were resolved), perhaps?