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#20151: 25.0.50; Smerge does "git add" for every final conflict resolution Date: Fri, 20 Mar 2015 10:29:17 -0400 Message-ID: References: <87iodwc9r0.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1426861845 13164 80.91.229.3 (20 Mar 2015 14:30:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Mar 2015 14:30:45 +0000 (UTC) Cc: 20151@debbugs.gnu.org To: David Kastrup Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 20 15:30:35 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 1YYxwT-00029a-7Z for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 15:30:29 +0100 Original-Received: from localhost ([::1]:44121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxwS-0000dS-GT for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 10:30:28 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxwH-0000ap-KR for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 10:30:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYxw9-0002w4-9S for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 10:30:17 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxw9-0002vQ-2i for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 10:30:09 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YYxw8-0007O7-Dk for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 10:30:08 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 20 Mar 2015 14:30:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20151 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20151-submit@debbugs.gnu.org id=B20151.142686176028305 (code B ref 20151); Fri, 20 Mar 2015 14:30:08 +0000 Original-Received: (at 20151) by debbugs.gnu.org; 20 Mar 2015 14:29:20 +0000 Original-Received: from localhost ([127.0.0.1]:59219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYxvL-0007MT-SX for submit@debbugs.gnu.org; Fri, 20 Mar 2015 10:29:20 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:57193) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYxvK-0007ML-AJ for 20151@debbugs.gnu.org; Fri, 20 Mar 2015 10:29:18 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t2KETHTf024533; Fri, 20 Mar 2015 10:29:17 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 2C194F63; Fri, 20 Mar 2015 10:29:17 -0400 (EDT) In-Reply-To: <87iodwc9r0.fsf@fencepost.gnu.org> (David Kastrup's message of "Fri, 20 Mar 2015 10:13:07 +0100") 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 RV5251=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5251> : inlines <2452> : streams <1408630> : uri <1885574> 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:100696 Archived-At: > However, when the conflict occured as the result of "git stash pop" > action in the work directory, the state of the index should not be > touched: the whole point of using git stash is to store work directory > and index separately and restore them separately. So probably > Smerge-mode would have to check whether a conflict is recorded in the > index before overwriting it. Sounds right. Patch welcome, Stefan