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: Fri, 25 Mar 2016 21:43:02 +0300 Message-ID: <8337re1jrd.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> <83oaa30wjs.fsf@gnu.org> <87vb4azznm.fsf@engster.org> <83egay25nj.fsf@gnu.org> <87r3eyzt20.fsf@engster.org> <83a8lm1w5s.fsf@gnu.org> <87d1qi5yz6.fsf@engster.org> <8360wa1myk.fsf@gnu.org> <874mbu5ttl.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458931419 19321 80.91.229.3 (25 Mar 2016 18:43:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 18:43:39 +0000 (UTC) Cc: johnw@gnu.org, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 19:43:34 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 1ajWhq-0007Pk-9Y for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 19:43:34 +0100 Original-Received: from localhost ([::1]:57491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajWhp-0000oI-ML for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 14:43:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajWhl-0000lA-JT for emacs-devel@gnu.org; Fri, 25 Mar 2016 14:43:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajWhk-00040o-Sb for emacs-devel@gnu.org; Fri, 25 Mar 2016 14:43:29 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34679) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajWhh-0003vQ-8n; Fri, 25 Mar 2016 14:43:25 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1074 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ajWhf-0002BR-Lb; Fri, 25 Mar 2016 14:43:24 -0400 In-reply-to: <874mbu5ttl.fsf@engster.org> (message from David Engster on Fri, 25 Mar 2016 18:52:06 +0100) 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:202241 Archived-At: > From: David Engster > Cc: johnw@gnu.org, emacs-devel@gnu.org > Date: Fri, 25 Mar 2016 18:52:06 +0100 > > > So I guess the fact that a commit was skipped during a merge is > > something that is so hard to see that perhaps the entire issue of > > skipping is moot with Git, and we shouldn't be bothered by it. > > Well, it's not *that* hard to see, but it usually requires to look at a > span of commits. In this case, > > git diff cb4e054e41c..300560577 > > will correctly produce nothing. But I agree it's unfortunate that you > cannot see this from the merge commit alone. But I'm not sure what you > mean with the entire issue being moot. How do you suggest we deal with > commits that shouldn't land in master? Sorry, I should have made it clear I was talking only about the backported commits.