From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Date: Tue, 14 Apr 2015 23:47:02 +0200 Organization: Probably a good idea Message-ID: <86wq1e4c2x.fsf@dod.no> References: <83d23hlmia.fsf@gnu.org> <20150407165131.GA2600@acm.fritz.box> <552486A4.2020803@yandex.ru> <5525D65C.8090303@yandex.ru> <83fv89g3dl.fsf@gnu.org> <87mw2he0d7.fsf@uwakimon.sk.tsukuba.ac.jp> <20150413210654.GB6324@acm.fritz.box> <878udv8w4j.fsf@uwakimon.sk.tsukuba.ac.jp> <20150414171635.GB4612@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429077390 11590 80.91.229.3 (15 Apr 2015 05:56:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 Apr 2015 05:56:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 15 07:56:22 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 1YiGJB-0002G1-Tf for ged-emacs-devel@m.gmane.org; Wed, 15 Apr 2015 07:56:22 +0200 Original-Received: from localhost ([::1]:58850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiGJB-0007DW-5o for ged-emacs-devel@m.gmane.org; Wed, 15 Apr 2015 01:56:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiGIy-0007DC-W8 for emacs-devel@gnu.org; Wed, 15 Apr 2015 01:56:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiGIu-00047f-Uf for emacs-devel@gnu.org; Wed, 15 Apr 2015 01:56:08 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:37168) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiGIu-00047b-Nm for emacs-devel@gnu.org; Wed, 15 Apr 2015 01:56:04 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YiGIs-00028r-Nj for emacs-devel@gnu.org; Wed, 15 Apr 2015 07:56:02 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 15 Apr 2015 07:56:02 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 15 Apr 2015 07:56:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 47 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Mail-Copies-To: never Cancel-Lock: sha1:fxSLtEyPkC1cOaCreeoVut1pglw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:185440 Archived-At: >>>>> Alan Mackenzie : > I don't know. But when it has happened to me, it has always been with > existing files in a repository directly cloned from a remote > repository. (I have no experience of other scenarios.) I can't even > say whether the loss of staging of files is a bug or an intended > feature. I tried an experiment today, and I succeeded in reproducing it (in an attempt at disproving it), but I didn't succeed in an attempt at reproducing it with a slightly simpler procedure. If I can reproduce it reliably I will file a bug with git. I ended up with the restored stashed file being empty. See the conflict at the end of the commands below: ... sb@mccoy:~/git/git-pull-test$ git pull Auto-merging foo Merge made by the 'recursive' strategy. foo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) sb@mccoy:~/git/git-pull-test$ git stash pop Auto-merging foo CONFLICT (content): Merge conflict in foo sb@mccoy:~/git/git-pull-test$ cat foo <<<<<<< Updated upstream hi there line two line three modified is there more? Here is more! Less is more! ======= >>>>>>> Stashed changes sb@mccoy:~/git/git-pull-test$ git --version git version 1.9.4.msysgit.1 (what I did was to create a local git repository, clone it to another local repository and try to pull at the same time as having stashed changes in a modified file in the cloned repository) However, this has never happened to me in a real situation, and I was unable to reproduce it when I tried again (but with a slightly simpler procedure).