From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Fri, 25 Mar 2016 10:15:41 +0100 Message-ID: <87vb4azznm.fsf@engster.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458897389 4755 80.91.229.3 (25 Mar 2016 09:16:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 09:16:29 +0000 (UTC) Cc: John Wiegley , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 10:16:06 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 1ajNqb-00015h-Rd for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 10:16:01 +0100 Original-Received: from localhost ([::1]:54845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNqb-0003wZ-3j for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 05:16:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNqX-0003vc-74 for emacs-devel@gnu.org; Fri, 25 Mar 2016 05:15:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajNqS-00036B-80 for emacs-devel@gnu.org; Fri, 25 Mar 2016 05:15:57 -0400 Original-Received: from randomsample.de ([5.45.97.173]:41044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajNqR-00035W-UZ; Fri, 25 Mar 2016 05:15:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=jYyc8nmaEg6n2e52SNXpsRzJfuMEBxGUiuMZQFPZE6g=; b=q2G+PTQ6AlG90fgDR0A00O1YBAiBuLbzMcdB5xifRdWcEd+Gf61KSv0jwRgn+cr7Jw3Ohf+teZ2j6x5cAhDoxb5TiO4RJuHrrYCqL3bKkrXqvg/FgVNxydptiiI7UTjC; Original-Received: from ip4d1494ed.dynamic.kabel-deutschland.de ([77.20.148.237] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ajNqL-0001Vd-KL; Fri, 25 Mar 2016 10:15:45 +0100 In-Reply-To: <83oaa30wjs.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Mar 2016 11:52:07 +0300") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:202215 Archived-At: 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. This is how it worked with Bazaar as well. -David