From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: vincent.belaiche@gmail.com (Vincent =?UTF-8?Q?Bela=C3=AFche?=) Newsgroups: gmane.emacs.bugs Subject: bug#22301: 25.1.50; Emacs crashes while lisp debugging Date: Mon, 01 Feb 2016 10:18:06 +0100 Message-ID: <84io28g569.fsf@gmail.com> References: <84oad2z3lp.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1454318374 27774 80.91.229.3 (1 Feb 2016 09:19:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Feb 2016 09:19:34 +0000 (UTC) Cc: 22301@debbugs.gnu.org, Vincent =?UTF-8?Q?Bela=C3=AFche?= To: Nicolas Richard Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 01 10:19:23 2016 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 1aQAdm-0001VM-4m for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Feb 2016 10:19:22 +0100 Original-Received: from localhost ([::1]:45386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQAdl-0002ra-Cc for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Feb 2016 04:19:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQAdW-0002Zz-0N for bug-gnu-emacs@gnu.org; Mon, 01 Feb 2016 04:19:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQAdS-0004So-PX for bug-gnu-emacs@gnu.org; Mon, 01 Feb 2016 04:19:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQAdS-0004Sk-MR for bug-gnu-emacs@gnu.org; Mon, 01 Feb 2016 04:19:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aQAdS-0000Eh-Ge for bug-gnu-emacs@gnu.org; Mon, 01 Feb 2016 04:19:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <84oad2z3lp.fsf@gmail.com> Resent-From: vincent.belaiche@gmail.com (Vincent =?UTF-8?Q?Bela=C3=AFche?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Feb 2016 09:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22301 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 22301-submit@debbugs.gnu.org id=B22301.1454318288834 (code B ref 22301); Mon, 01 Feb 2016 09:19:02 +0000 Original-Received: (at 22301) by debbugs.gnu.org; 1 Feb 2016 09:18:08 +0000 Original-Received: from localhost ([127.0.0.1]:43895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQAca-0000DO-I1 for submit@debbugs.gnu.org; Mon, 01 Feb 2016 04:18:08 -0500 Original-Received: from smtp01.smtpout.orange.fr ([80.12.242.123]:39930 helo=smtp.smtpout.orange.fr) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQAcY-0000Cv-UL for 22301@debbugs.gnu.org; Mon, 01 Feb 2016 04:18:07 -0500 Original-Received: from AigleRoyal ([2.12.115.118]) by mwinf5d36 with ME id CxHy1s0092ZLEDN03xHy8J; Mon, 01 Feb 2016 10:18:00 +0100 X-ME-Helo: AigleRoyal X-ME-Auth: dmluY2VudGJlbGFpY2hlQG9yYW5nZS5mcg== X-ME-Date: Mon, 01 Feb 2016 10:18:00 +0100 X-ME-IP: 2.12.115.118 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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:112195 Archived-At: 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 =E9crit : >> 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, >