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: Mon, 20 Apr 2015 17:45:20 +0300 Message-ID: <83fv7u6epr.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 1429541186 13340 80.91.229.3 (20 Apr 2015 14:46:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 14:46:26 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org, dgutov@yandex.ru To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 20 16:46:14 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 1YkCxf-0003sk-V4 for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 16:46:12 +0200 Original-Received: from localhost ([::1]:53971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxe-0005LJ-Oc for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 10:46:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxa-0005Ic-DX for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 10:46:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkCxX-0003Pd-3J for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 10:46:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxX-0003PT-05 for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 10:46:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YkCxW-0006Yt-MO for bug-gnu-emacs@gnu.org; Mon, 20 Apr 2015 10:46: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: Mon, 20 Apr 2015 14:46: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.142954113625184 (code B ref 20292); Mon, 20 Apr 2015 14:46:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 20 Apr 2015 14:45:36 +0000 Original-Received: from localhost ([127.0.0.1]:33697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkCx5-0006Y7-Gl for submit@debbugs.gnu.org; Mon, 20 Apr 2015 10:45:35 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:38269) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YkCx3-0006Xt-Ai for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 10:45:34 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NN400K000LEV400@a-mtaout21.012.net.il> for 20292@debbugs.gnu.org; Mon, 20 Apr 2015 17:45:27 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN400KBS0ZQRN90@a-mtaout21.012.net.il>; Mon, 20 Apr 2015 17:45:27 +0300 (IDT) In-reply-to: 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:101756 Archived-At: > From: Stefan Monnier > Cc: Eli Zaretskii , esr@snark.thyrsus.com, 20292@debbugs.gnu.org > Date: Sun, 19 Apr 2015 22:41:18 -0400 > > I get the impression that with this change vc-find-conflicted-files > won't work correctly any more, because the files will keep appearing > as "conflicted", even after I've resolved all the conflicts in them. You need to "unconflict" them by hand, yes, with "git reset HEAD FILE". If it is safe to issue this command automatically, we could do that in the case of "stash pop" conflict _instead_ of doing "git add" in the "normal" merge-conflict case.