From: vincent.belaiche@gmail.com (Vincent Belaïche)
To: Nicolas Richard <youngfrog@members.fsf.org>
Cc: 22301@debbugs.gnu.org, "Vincent Belaïche" <vincent.belaiche@gmail.com>
Subject: bug#22301: 25.1.50; Emacs crashes while lisp debugging
Date: Mon, 01 Feb 2016 10:18:06 +0100 [thread overview]
Message-ID: <84io28g569.fsf@gmail.com> (raw)
In-Reply-To: <84oad2z3lp.fsf@gmail.com>
Thank you for the comment. I did the diff and my changes were ok. Anyway
nobody else than me had changed ses.el, so the merge was rather that
many other files were affected. Indeed I was just surprised by the very
large amout of files affected in a so short lapse of time.
Vincent.
Le 20/01/2016 16:30, Nicolas Richard a écrit :
>> automatic commit there is an incredible number of files affected. I
>> don't know why that happened so... I hope I did not make anything too
>> hard to revert if need be.
>
> IIUC you're talking about the merge commit you created, namely
> b895c72059521fec064ff27b4cfcfa4104081c4e.
>
> What you did is that you were on your local branch, with your SES
> changes, then you git pull'd from savannah/master which created a merge
> commit (and then pushed the result). When creating a merge commit, emacs
> uses current commit as first parent, and the second parent is the commit
> at the tip of the other branch (in your case savannah/master).
>
> Now the trick is that "git diff" will show the diff wrt the *first*
> parent. In this case, git diff thus shows a diff between the merged
> state and the first parent, which is your own commit. IOW, it doesn't
> show what you changed, but everything that was changed by all other
> people. This is why there are many changes and you don't recognize them.
>
> If you want to check that you merged correctly, do this:
> "git diff b895c720^2 b895c720"
> or equivalently (at least with bash) :
> git diff b895c720{^2,}
> The "^2" part means "take second parent of given commit".
>
> HTH,
>
next prev parent reply other threads:[~2016-02-01 9:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-03 22:43 bug#22301: 25.1.50; Emacs crashes while lisp debugging Vincent Belaïche
2016-01-04 3:41 ` Eli Zaretskii
2016-01-04 8:00 ` Vincent Belaïche
2016-01-04 15:54 ` Eli Zaretskii
2016-01-04 22:49 ` Vincent Belaïche
2016-01-05 3:34 ` Eli Zaretskii
2016-01-05 7:17 ` Vincent Belaïche
2016-01-05 16:00 ` Eli Zaretskii
2016-01-14 16:15 ` Vincent Belaïche
2016-01-14 18:20 ` Eli Zaretskii
2016-01-14 22:54 ` Vincent Belaïche
2016-01-15 7:46 ` Eli Zaretskii
2016-01-15 7:56 ` Vincent Belaïche
2016-01-15 8:12 ` Eli Zaretskii
2016-01-19 23:34 ` Vincent Belaïche
2016-01-20 1:58 ` Alexis
2016-01-20 4:31 ` Eli Zaretskii
2016-01-20 8:50 ` Vincent Belaïche
2016-01-20 9:49 ` Eli Zaretskii
2016-01-20 15:30 ` Nicolas Richard
2016-02-01 9:18 ` Vincent Belaïche [this message]
2016-02-01 17:22 ` Vincent Belaïche
2016-02-02 7:14 ` Vincent Belaïche
2016-12-07 18:55 ` Glenn Morris
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=84io28g569.fsf@gmail.com \
--to=vincent.belaiche@gmail.com \
--cc=22301@debbugs.gnu.org \
--cc=youngfrog@members.fsf.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).