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:50:08 +0300 Message-ID: <83egay25nj.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458903081 25602 80.91.229.3 (25 Mar 2016 10:51:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 10:51:21 +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 11:51:12 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 1ajPKh-00082H-3y for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 11:51:11 +0100 Original-Received: from localhost ([::1]:55456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPKg-00042V-F6 for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 06:51:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPKE-0003zX-19 for emacs-devel@gnu.org; Fri, 25 Mar 2016 06:51:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajPJu-0005EH-Rb for emacs-devel@gnu.org; Fri, 25 Mar 2016 06:50:41 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajPJp-00058t-Gf; Fri, 25 Mar 2016 06:50:17 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4759 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ajPJo-0003zL-G3; Fri, 25 Mar 2016 06:50:17 -0400 In-reply-to: <87vb4azznm.fsf@engster.org> (message from David Engster on Fri, 25 Mar 2016 10:15:41 +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:202217 Archived-At: > From: David Engster > Cc: John Wiegley , emacs-devel@gnu.org > Date: Fri, 25 Mar 2016 10:15:41 +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. > > When you merge a branch, you have to merge all of it. But when they are > marked as 'skipped', they will be merged with strategy "ours", > effectively ignoring their content. What does "their content" include, exactly? > This is how it worked with Bazaar as well. With Bazaar, there was a clear mainline, displaying which these commits wouldn't appear at all. We don't have that with Git, so the analogy doesn't really help.