From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Fri, 25 Mar 2016 20:29:01 +0100 Message-ID: <87bn62e4qq.fsf@wanadoo.es> References: <56EE8B27.3090208@gmx.at> <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> <8337re1jrd.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458934172 30630 80.91.229.3 (25 Mar 2016 19:29:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Mar 2016 19:29:32 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 25 20:29:25 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 1ajXQC-0005Ic-Ee for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 20:29:24 +0100 Original-Received: from localhost ([::1]:57649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajXQB-0000zz-F6 for ged-emacs-devel@m.gmane.org; Fri, 25 Mar 2016 15:29:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajXQ7-0000zi-RP for emacs-devel@gnu.org; Fri, 25 Mar 2016 15:29:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajXQ4-0006oC-MQ for emacs-devel@gnu.org; Fri, 25 Mar 2016 15:29:19 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:37143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajXQ4-0006o2-Fy for emacs-devel@gnu.org; Fri, 25 Mar 2016 15:29:16 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ajXPx-0005BF-R8 for emacs-devel@gnu.org; Fri, 25 Mar 2016 20:29:10 +0100 Original-Received: from 151.red-79-153-146.dynamicip.rima-tde.net ([79.153.146.151]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Mar 2016 20:29:09 +0100 Original-Received: from ofv by 151.red-79-153-146.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 25 Mar 2016 20:29:09 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 12 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 151.red-79-153-146.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) Cancel-Lock: sha1:6+U+5krsQwwUJGVUJOuPUQiM3pk= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:202246 Archived-At: Eli Zaretskii writes: >> 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. A backported commit still can produce a conflict if the code affected by that commit is modified again later on master.