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:14:05 +0300 Message-ID: <5534FB9D.4070502@yandex.ru> References: <20150419192734.3632.17817@vcs.savannah.gnu.org> 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 1429535665 12105 80.91.229.3 (20 Apr 2015 13:14:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 13:14:25 +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:14:21 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 1YkBWl-0002tk-5G for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 15:14:19 +0200 Original-Received: from localhost ([::1]:53449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBWk-0006GF-5n for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 09:14:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBWf-0006DE-LF for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:14:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkBWc-0002br-DJ for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:14:13 -0400 Original-Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:36776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkBWc-0002bW-1W for emacs-devel@gnu.org; Mon, 20 Apr 2015 09:14:10 -0400 Original-Received: by wgsk9 with SMTP id k9so178346793wgs.3 for ; Mon, 20 Apr 2015 06:14:09 -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=0AN1/jDLWTkFG4WWSGQ1sZNbcuayPDhFytv6PIjTvQc=; b=FTe8eR/9EeGNr+V+YfCl+ozetdRadNps+zTAo5pMjh1FByjSCtpTK8t/LFtEVOSUre A3E2eVnpZvngs0N7R4bCd8pyUeOXQXFbgDR/IcNKo7AtGRaHS6VU1CVD6Qqs42Debuyg 3NcWweqXZdPb2lbmC5D//mX69k1DI2H2NGuaDitsv25Tq0RvTHTUm7KNW+y5SmTdnlQV HKQXStx2HfO+GihcdQGdCHaEsPv0dhbrI0Z8h5QzUnPR9Ep91+GGOPbvbNXb2g2B65Ph HaD/E71M7SRSdhb85bydIqXQKX4jRcJYXYE2WQt6r3lwDfLgPac7qaw97HER5qwT3gPV fN5g== X-Received: by 10.194.78.49 with SMTP id y17mr31333204wjw.131.1429535649191; Mon, 20 Apr 2015 06:14:09 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id dx11sm27240656wjb.23.2015.04.20.06.14.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 06:14:08 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::233 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:185699 Archived-At: On 04/20/2015 05:48 AM, Stefan Monnier wrote: > I care a lot more about having Git know that the conflict is resolved, > than about the fine distinction between what was staged and what wasn't. Very well. > 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. So, > it would still work as before in the case where there was nothing staged > before the "stash pop". Hmm, it seem I can't really detect whether the file had something staged (whether the conflict is due to that, or some new commits, 'git diff --cached', for instance, only says '* Unmerged path test2'). Maybe there's nothing to recover at that point anyway (someone feel free to correct me here). > 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. Guess I'm not enough of an aficionado, then. After plenty of searching and reading the man pages, 'git add' followed by 'git reset' is the best I have.