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 13:48:14 +0300 Message-ID: <83fuve25qp.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458902921 22940 80.91.229.3 (25 Mar 2016 10:48:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 10:48:41 +0000 (UTC) Cc: johnw@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 11:48:35 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 1ajPIA-0006jY-Kx for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 11:48:34 +0100 Original-Received: from localhost ([::1]:55448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPI9-0003Mr-JH for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 06:48:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPI5-0003Ls-Ks for emacs-devel@gnu.org; Fri, 25 Mar 2016 06:48:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajPI4-0004HF-Oz for emacs-devel@gnu.org; Fri, 25 Mar 2016 06:48:29 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPHz-0004Bx-Kb; Fri, 25 Mar 2016 06:48:23 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4758 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ajPHy-0001FX-T6; Fri, 25 Mar 2016 06:48:23 -0400 In-reply-to: (message from Andreas Schwab on Fri, 25 Mar 2016 10:14:10 +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:202216 Archived-At: > From: Andreas Schwab > Cc: John Wiegley , emacs-devel@gnu.org > Date: Fri, 25 Mar 2016 10:14:10 +0100 > > Eli Zaretskii writes: > > > There seems to be another issue with merging to master: we get back > > commits that were cherry-picked from master to the release branch. > > What do you mean with "get back"? Since they are part of the history of > the branch and merging incorporates the whole history you will of course > see them from master. They were supposed to be skipped during merging, so if what we have currently is the expected result, then what exactly does "skip" mean in this context?