From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier 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 22:41:18 -0400 Message-ID: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429497739 13693 80.91.229.3 (20 Apr 2015 02:42:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 02:42:19 +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 Mon Apr 20 04:42:09 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 1Yk1ey-0001Fa-S8 for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Apr 2015 04:42:09 +0200 Original-Received: from localhost ([::1]:51631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk1ey-0005pn-7z for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 22:42:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk1ev-0005pf-9n for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 22:42:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yk1es-00084h-4D for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 22:42:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk1es-00084d-1d for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 22:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Yk1er-0008CE-OG for bug-gnu-emacs@gnu.org; Sun, 19 Apr 2015 22:42:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Apr 2015 02:42: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.142949768331458 (code B ref 20292); Mon, 20 Apr 2015 02:42:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 20 Apr 2015 02:41:23 +0000 Original-Received: from localhost ([127.0.0.1]:32838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yk1eE-0008BK-W3 for submit@debbugs.gnu.org; Sun, 19 Apr 2015 22:41:23 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:45009) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yk1eD-0008BB-5X for 20292@debbugs.gnu.org; Sun, 19 Apr 2015 22:41:21 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t3K2fIYf021622; Sun, 19 Apr 2015 22:41:18 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 20722282C; Sun, 19 Apr 2015 22:41:18 -0400 (EDT) In-Reply-To: <5533F446.4020400@yandex.ru> (Dmitry Gutov's message of "Sun, 19 Apr 2015 21:30:30 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5281=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5281> : inlines <2753> : streams <1425378> : uri <1910937> 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:101744 Archived-At: >> If we can, yes. If not, this is way out of scope of the bug report. > Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63? My main use case is "git stash pop; then repeatedly call M-x vc-find-conflicted-files and resolve the conflicts (mostly with smerge's help)". 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. Stefan