From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov 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 16:35:04 +0300 Message-ID: <55350088.1050004@yandex.ru> References: <20150419192734.3632.17817@vcs.savannah.gnu.org> <5534FB9D.4070502@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1429536980 2503 80.91.229.3 (20 Apr 2015 13:36:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 13:36:20 +0000 (UTC) To: Stefan Monnier , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 20 15:36:15 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 1YkBry-0006rd-Cr for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 15:36:14 +0200 Original-Received: from localhost ([::1]:53553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBrx-0005F4-T5 for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 09:36:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBr1-0004fQ-Cw for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:35:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkBqv-0002um-RE for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:35:15 -0400 Original-Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:34984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBqv-0002ub-JX for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:35:09 -0400 Original-Received: by wgyo15 with SMTP id o15so179424213wgy.2 for ; Mon, 20 Apr 2015 06:35:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=4d6alZ8xcH8kfCbnJNEYtqq/x1lv/0kg/QJUBTYrXac=; b=XAgNmCgwTD8q5kjpbFjU9AokXGocR4CuvK5M4BCnfw9gweyL9iJpy9tkuUvmmcFGjz Rc0NDYfdGMhWkMVxsfTJQgRXBRoPvQ9GZTZ8TH9NyPSOEtbg2I8dX+LdGDiZk9Dd17Rg 0nk05VKbOZMXuw6jmwanRVeVEEldzfFfi/rlShVMG066TyEuOgc8CUkLoA3CgV7x8Yn4 TsBn1wqB/uOze4fahVovQQtZyDh9tvNGwELCREtKjJC8JzXyFU0j0nYFO+BDT/YXh3Gr DgDtqRL8IrOtGzrbKXOboRulFBhLQ1QbqqKLRNOzhPC6ykwun3FKASeu6lF3kzEL008c keTQ== X-Received: by 10.180.35.8 with SMTP id d8mr25655943wij.39.1429536908793; Mon, 20 Apr 2015 06:35:08 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id b1sm27317275wjs.17.2015.04.20.06.35.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 06:35:07 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <5534FB9D.4070502@yandex.ru> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::232 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:185700 Archived-At: On 04/20/2015 04:14 PM, Dmitry Gutov wrote: > Hmm, it seem I can't really detect whether the file had something staged IOW, the best indicator we have of whether to reset or not, AFAICT, is the presence of .git/MERGE_HEAD.