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 21:46:04 +0200 Message-ID: <8337ri47pf.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> <83lh5a4bh1.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458676010 29905 80.91.229.3 (22 Mar 2016 19:46:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:46:50 +0000 (UTC) Cc: rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org, phillip.lord@russet.org.uk To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:46:45 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 1aiSGJ-00025y-Hy for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:46:43 +0100 Original-Received: from localhost ([::1]:39311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSGI-0003UP-VV for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:46:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSG5-0003UK-OC for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:46:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiSG1-0005yS-NE for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:46:29 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSG1-0005yO-K7; Tue, 22 Mar 2016 15:46:25 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4475 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiSFz-0000Yp-UI; Tue, 22 Mar 2016 15:46:24 -0400 In-reply-to: (message from John Wiegley on Tue, 22 Mar 2016 12:21:10 -0700) 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:202100 Archived-At: > From: John Wiegley > Cc: phillip.lord@russet.org.uk (Phillip Lord), rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Tue, 22 Mar 2016 12:21:10 -0700 > > >>>>> Eli Zaretskii writes: > > > 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. > > One take away from this is to be very cautious in assessing whether merge > commits should really be skipped or not. What is the criteria for knowing > when they *should* be skipped? Checking to ensure that all those commits are > already on master? That would be a lot of work, IMO. I actually don't understand why we should skip _any_ merge-commits. Can you (or someone else) describe a situation where merging such commits to master wouldn't be TRT?