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 22:09:39 +0300 Message-ID: <5554F2F3.6010109@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> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.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 1431630625 23525 80.91.229.3 (14 May 2015 19:10:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2015 19:10:25 +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 21:10:14 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 1YsyWL-00040t-CY for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 21:10:13 +0200 Original-Received: from localhost ([::1]:56466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyWK-0006zL-HY for geb-bug-gnu-emacs@m.gmane.org; Thu, 14 May 2015 15:10:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyWF-0006xH-VL for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:10:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsyWC-0004UF-4N for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:10:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsyWC-0004TO-25 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:10:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsyWB-0002R0-F1 for bug-gnu-emacs@gnu.org; Thu, 14 May 2015 15:10:03 -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 19:10:03 +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.14316305939338 (code B ref 20292); Thu, 14 May 2015 19:10:03 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 14 May 2015 19:09:53 +0000 Original-Received: from localhost ([127.0.0.1]:45391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyW0-0002QX-Qj for submit@debbugs.gnu.org; Thu, 14 May 2015 15:09:53 -0400 Original-Received: from mail-wg0-f52.google.com ([74.125.82.52]:32946) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsyVz-0002QI-BS for 20292@debbugs.gnu.org; Thu, 14 May 2015 15:09:52 -0400 Original-Received: by wgin8 with SMTP id n8so85978255wgi.0 for <20292@debbugs.gnu.org>; Thu, 14 May 2015 12:09:45 -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=NnLxa57rBsh/Ni4Puj60dgSGLBYZr4TTX2yjyc+ENPI=; b=0HfjyR1rDSnvm2AxeI+2nxYM9mJz+Wq223okwdMnQkXYNIdkaDdbibNFVF0rciRCWB NMdS8DDjMYIZCKygmDdGi3Syal7abqyNUnsY+JNcS4GTEYfU7LVCHV7LHro+IxOFu2Es MBtFBAo0E64nSiKAlFMWyS4Udbue/jYVsIF8QaIUrzBcdxcSCR5OchjzaY8bxVvGfhQe sfQC4GIFTgEKajBBqVtH9WScMxdvZJr//3Cp+j7BIajoeicPhkw6NEkx1Em93fNUBoBE NkW0eajRCIb+ZGTJPrbwlgjMdOTKOx4mFCdzT176j8dlpJjsQfFvZalIhidaguu/2U4s lbqQ== X-Received: by 10.180.74.208 with SMTP id w16mr26820043wiv.31.1431630585591; Thu, 14 May 2015 12:09:45 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id g11sm39529630wjr.25.2015.05.14.12.09.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 12:09:45 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <83iobvhtzw.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:102805 Archived-At: On 05/14/2015 09:52 PM, Eli Zaretskii wrote: > I think its a good idea. It might be. But I don't actually know how to approach it. Doing 'git reset' right after a stash is popped would break vc-git-conflicted-files. If we don't do that, then what else *do* we do in vc-git-stash-apply and vc-git-stash-pop? Note that vc-git-resolve-when-done has to work satisfactorily both after vc-git-stash-apply, and after 'git stash apply' performed in console.