From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Thu, 14 May 2015 21:48:21 +0300 Message-ID: <5554EDF5.5050606@yandex.ru> References: <83fv88ta5r.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> <83fv7u6epr.fsf@gnu.org> <838udm61ur.fsf@gnu.org> <5536FE56.406@yandex.ru> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.fsf@gnu.org> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@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 1431629360 1484 80.91.229.3 (14 May 2015 18:49:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 18:49:20 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 14 20:49: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 1YsyBx-00031k-8z for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 20:49:09 +0200 Original-Received: from localhost ([::1]:56312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyBw-0005IM-Iv for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 14:49:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyBt-0005IH-C8 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:49:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsyBq-00043E-1l for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:49:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyBp-000438-V2 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:49:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsyBp-0001sO-Mj for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 14:49:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 May 2015 18:49: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.14316293167176 (code B ref 20292); Thu, 14 May 2015 18:49:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 18:48:36 +0000 Original-Received: from localhost ([127.0.0.1]:45360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyBP-0001rf-WE for submit@debbugs.gnu.org; Thu, 14 May 2015 14:48:36 -0400 Original-Received: from mail-wi0-f173.google.com ([209.85.212.173]:35785) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyBN-0001rR-Gc for 20292@debbugs.gnu.org; Thu, 14 May 2015 14:48:34 -0400 Original-Received: by wicmx19 with SMTP id mx19so28410120wic.0 for <20292@debbugs.gnu.org>; Thu, 14 May 2015 11:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=Yvq9LXICg2DD8TQ0klu8Q9qPqPOm7IMWKrKRDuz/JG0=; b=hKqWopLV43kg9Pz8TuNHP3LuzjZD00Z4SBgSoX/By+xJib3yAsLDchmMn7sarvz9iu coGCQshjs2dC2tVsHEx6F4gsebYX3rTuXbguDJK59Y5ggLiRYZLh7VXcOp2M6dLQLHzF 64t/i0v6wLIjemNtzjY2VWhAsTEpC91xvratpwvTH/vGG81tX0zWnwRnAGqHJ30wq8Gv aq4/yWieb2fAKvxcJk8fCe9+oylsalPQ0OI6dfcH+WPNoIKYijMo8DekDvhlZSUpg5xO n/rGeSmSf1LY8r8cAd+9A/zPyskopJsdjLTL6LrtIbZZiHinyzU9dCjfEWb4GThDNfDp 9rvw== X-Received: by 10.194.236.33 with SMTP id ur1mr9499321wjc.77.1431629307722; Thu, 14 May 2015 11:48:27 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id fa8sm14563182wib.14.2015.05.14.11.48.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 11:48:23 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <83mw17huqr.fsf@gnu.org> 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:102801 Archived-At: On 05/14/2015 09:36 PM, Eli Zaretskii wrote: > So: do we have a way of knowing which files had their changes stashed? I don't think so. Further, like I mentioned before, the user might have staged some further changes to those other, non-conflicting files. Do you apply stashes via the vc-dir interface? We could do something in that implementation.