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 05:35:32 +0200 Message-ID: <8360wf5gmz.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458617776 20516 80.91.229.3 (22 Mar 2016 03:36:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 03:36:16 +0000 (UTC) Cc: rudalics@gmx.at, eggert@cs.ucla.edu, emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 04:36:11 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 1aiD74-0006Ef-LR for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 04:36:10 +0100 Original-Received: from localhost ([::1]:33481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiD73-0000MU-V9 for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 23:36:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiD6q-0000MP-Uq for emacs-devel@gnu.org; Mon, 21 Mar 2016 23:35:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiD6n-00051i-Mr for emacs-devel@gnu.org; Mon, 21 Mar 2016 23:35:56 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiD6n-00051e-JN; Mon, 21 Mar 2016 23:35:53 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3481 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiD6m-0004Vt-Pw; Mon, 21 Mar 2016 23:35:53 -0400 In-reply-to: (message from John Wiegley on Mon, 21 Mar 2016 14:27:54 -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:202054 Archived-At: > From: John Wiegley > Cc: eggert@cs.ucla.edu, rudalics@gmx.at, emacs-devel@gnu.org > 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.