From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 20:24:42 +0200 Message-ID: <83lh5a4bh1.fsf@gnu.org> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> <874mbyjvlq.fsf@russet.org.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458671124 15416 80.91.229.3 (22 Mar 2016 18:25:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 18:25:24 +0000 (UTC) Cc: rudalics@gmx.at, johnw@gnu.org, emacs-devel@gnu.org, eggert@cs.ucla.edu To: phillip.lord@russet.org.uk (Phillip Lord) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 19:25:14 2016 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 1aiQzR-0000Yo-Kc for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 19:25:13 +0100 Original-Received: from localhost ([::1]:38828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiQzQ-0006iu-Ho for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 14:25:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiQzN-0006h6-IE for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:25:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiQzM-0000wx-Lp for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:25:09 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60582) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiQzJ-0000tE-Fq; Tue, 22 Mar 2016 14:25:05 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4325 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiQzF-0002tE-VX; Tue, 22 Mar 2016 14:25:04 -0400 In-reply-to: <874mbyjvlq.fsf@russet.org.uk> (phillip.lord@russet.org.uk) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202086 Archived-At: > From: phillip.lord@russet.org.uk (Phillip Lord) > Cc: John Wiegley , rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Tue, 22 Mar 2016 17:00:49 +0000 > > Eli Zaretskii writes: > >> But in these cases, the commit we lost should have been mentioned in > >> the list of skipped one. It wasn't, AFAICS. > > > > I think I know what happened. It goes like this: > > > > . Phillip worked on test selector for the test suite. When he > > finished, he made a local commit 549a765 on the emacs-25 branch. > > > > . Phillip then said "git pull", followed by "git push". This > > produced the merge-commit bb0cd31, which incorporated 9 other > > commits that were pushed there since the time Phillip started > > working on 549a765. One of these 9 commits was my commit that > > fixed resize_frame_windows. > > Oh dear, should have made those changes on a branch and rebased from > emacs-25. It's not your fault. Quite a few others (myself included) produce these merge-commits from time to time, this cannot be avoided. The problem is in the merge procedure from emacs-25 to master -- it shouldn't skip such merge-commits.