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 18:18:39 +0200 Message-ID: <83wpou4hb4.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458663559 18902 80.91.229.3 (22 Mar 2016 16:19:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 16:19:19 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley , rudalics@gmx.at, eggert@cs.ucla.edu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 17:19: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 1aiP1V-0003Mi-S5 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 17:19:14 +0100 Original-Received: from localhost ([::1]:38255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiP1V-0004CK-5j for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 12:19:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiP1Q-00049Y-Tn for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:19:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiP1M-0000Ct-Pl for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:19:08 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiP1H-0000Bo-R8; Tue, 22 Mar 2016 12:18:59 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4128 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiP1G-0000Ym-VJ; Tue, 22 Mar 2016 12:18:59 -0400 In-reply-to: <8360wf5gmz.fsf@gnu.org> (message from Eli Zaretskii on Tue, 22 Mar 2016 05:35:32 +0200) 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:202073 Archived-At: > Date: Tue, 22 Mar 2016 05:35:32 +0200 > From: Eli Zaretskii > Cc: rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org > > > From: John Wiegley > > Cc: address@hidden, address@hidden, address@hidden > > Date: Mon, 21 Mar 2016 14:27:54 -0700 > > > > As for "reason for the omission", I think there are two possible answers: > > > > 1. gitmerge.el auto-marked it to be skipped, and despite my examination of > > each such mark, I failed to see that should not be skipped. > > > > 2. I incorrectly resolved a merge conflict that seemed simple enough to me > > that I didn't e-mail the author of the commit about it. > > 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. . When John merged all of that to master, bb0cd31 was skipped. Skipping it omitted all the 9 commits that were merged by bb0cd31. So the question (to John) now becomes: why was bb0cd31 skipped? Was that something that gitmerge.el suggested? If so, we should fix gitmerge.el not to make such dangerous proposals in the future. We should also audit all the other commits merged in bb0cd31, and probably also in any other similar merge-commit that was skipped by John in the merge to master.