From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
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 [thread overview]
Message-ID: <86wq1e4c2x.fsf@dod.no> (raw)
In-Reply-To: 20150414171635.GB4612@acm.fritz.box
>>>>> Alan Mackenzie <acm@muc.de>:
> 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).
next prev parent reply other threads:[~2015-04-14 21:47 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150405124321.362.95112@vcs.savannah.gnu.org>
[not found] ` <E1Yejtc-00007F-4B@vcs.savannah.gnu.org>
2015-04-05 12:56 ` [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Dmitry Gutov
2015-04-05 13:08 ` Eli Zaretskii
2015-04-05 13:16 ` Dmitry Gutov
2015-04-05 15:43 ` Eli Zaretskii
2015-04-05 19:47 ` Dmitry Gutov
2015-04-05 20:07 ` Eli Zaretskii
2015-04-05 22:32 ` Dmitry Gutov
2015-04-06 7:54 ` Eli Zaretskii
2015-04-06 12:03 ` Dmitry Gutov
2015-04-06 12:24 ` Eli Zaretskii
2015-04-06 23:32 ` Dmitry Gutov
2015-04-07 6:12 ` Eli Zaretskii
2015-04-07 16:13 ` Richard Stallman
2015-04-07 16:32 ` Eli Zaretskii
2015-04-07 16:51 ` Alan Mackenzie
2015-04-07 17:12 ` Eli Zaretskii
2015-04-07 20:11 ` Alan Mackenzie
2015-04-08 6:36 ` Eli Zaretskii
2015-04-08 1:38 ` Dmitry Gutov
2015-04-08 10:48 ` Alan Mackenzie
2015-04-08 22:19 ` chad
2015-04-09 13:16 ` Richard Stallman
2015-04-09 1:16 ` Dmitry Gutov
2015-04-09 7:27 ` Eli Zaretskii
2015-04-09 12:20 ` Dmitry Gutov
2015-04-09 12:51 ` Eli Zaretskii
2015-04-09 16:12 ` Dmitry Gutov
2015-04-08 18:19 ` Richard Stallman
2015-04-09 1:31 ` Dmitry Gutov
2015-04-09 7:36 ` Eli Zaretskii
2015-04-09 16:24 ` Stephen J. Turnbull
2015-04-09 16:35 ` Eli Zaretskii
2015-04-10 4:53 ` Stephen J. Turnbull
2015-04-10 7:49 ` Eli Zaretskii
2015-04-10 8:30 ` Stephen J. Turnbull
2015-04-11 19:18 ` Richard Stallman
2015-04-12 6:10 ` Stephen J. Turnbull
2015-04-13 21:06 ` Alan Mackenzie
2015-04-13 23:08 ` Stephen J. Turnbull
2015-04-14 17:16 ` Alan Mackenzie
2015-04-14 17:31 ` Eli Zaretskii
2015-04-14 21:23 ` João Távora
2015-04-15 2:46 ` Eli Zaretskii
2015-04-15 8:09 ` Harald Hanche-Olsen
2015-04-15 16:13 ` Eli Zaretskii
2015-04-15 16:21 ` Harald Hanche-Olsen
2015-04-15 16:36 ` Eli Zaretskii
2015-04-14 21:47 ` Steinar Bang [this message]
2015-04-08 18:21 ` Richard Stallman
2015-04-08 18:29 ` Eli Zaretskii
2015-04-08 19:18 ` John Yates
2015-04-09 13:41 ` Stephen J. Turnbull
2015-04-08 1:32 ` Dmitry Gutov
2015-04-08 18:19 ` Richard Stallman
2015-04-09 1:19 ` Dmitry Gutov
2015-04-09 7:31 ` Eli Zaretskii
2015-04-09 11:43 ` Dmitry Gutov
2015-04-07 20:45 ` Stephen J. Turnbull
2015-04-08 5:39 ` Eli Zaretskii
2015-04-05 17:42 ` Richard Stallman
2015-04-05 18:04 ` Eli Zaretskii
2015-04-06 5:50 ` Richard Stallman
2015-04-06 7:43 ` Eli Zaretskii
2015-04-06 7:45 ` Harald Hanche-Olsen
2015-04-07 16:13 ` Richard Stallman
2015-04-07 17:05 ` Eli Zaretskii
2015-04-08 12:02 ` Sebastien Vauban
2015-04-08 12:26 ` Harald Hanche-Olsen
2015-04-08 18:01 ` Stephen J. Turnbull
2015-04-08 12:38 ` Eli Zaretskii
2015-04-15 0:34 ` Rostislav Svoboda
2015-04-05 17:42 ` Richard Stallman
2015-04-05 19:01 ` Harald Hanche-Olsen
2015-04-05 21:00 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86wq1e4c2x.fsf@dod.no \
--to=sb@dod.no \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).