From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict Date: Mon, 20 Apr 2015 17:46:05 +0300 Message-ID: <83egne6eoi.fsf@gnu.org> References: <20150419192734.3632.17817@vcs.savannah.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429541195 13708 80.91.229.3 (20 Apr 2015 14:46:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 14:46:35 +0000 (UTC) Cc: dgutov@yandex.ru, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 20 16:46:28 2015 Return-path: Envelope-to: ged-emacs-devel@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 1YkCxv-00043l-Ol for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 16:46:27 +0200 Original-Received: from localhost ([::1]:53976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxu-0005jM-VY for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 10:46:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxm-0005ZX-Ed for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:46:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkCxh-0003UE-UK for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:46:18 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:47100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkCxh-0003Tk-MA for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:46:13 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NN400B000YXOU00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Mon, 20 Apr 2015 17:46:12 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN400B0Q10ZDT60@a-mtaout22.012.net.il>; Mon, 20 Apr 2015 17:46:12 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185704 Archived-At: > From: Stefan Monnier > Date: Sun, 19 Apr 2015 22:48:24 -0400 > Cc: Dmitry Gutov > > Actually, I think the above is too ad-hoc, testing `stashed' which is > only tangentially related to the problem. The bug was specifically about incorrect staging of stashed changes, which were supposed to be left unstaged and uncommitted after resolving the conflict. So I don't see how this is tangential to the problem; AFAIU it _is_ the problem. > Better would be for vc-git-resolve-when-done to check the status of the > file and only `git add' it if it doesn't have anything staged yet. Why should what we do with some file depend on whether there are other changes staged? (Or maybe I don't understand what "it" means in this case.) > Or better yet, do the "mark as resolved" differently, which doesn't > involved touching the "staging area". Not sure how to do that, but Git > aficionados should be able to find some clever hack for that, involving > less than 10 commands. The way I know of is "git reset HEAD FILE". But is that safe in the case in point?