From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Marking changes to be backported Date: Mon, 06 Oct 2014 09:25:49 -0400 Message-ID: References: <871tqr81jg.fsf@netris.org> <51r3yorc4p.fsf@fencepost.gnu.org> <87tx3jiknk.fsf@lifelogs.com> <87h9zj5sg6.fsf@yeeloong.lan> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1412601977 30254 80.91.229.3 (6 Oct 2014 13:26:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Oct 2014 13:26:17 +0000 (UTC) Cc: Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 06 15:26:11 2014 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 1Xb8Ik-0007t8-T4 for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 15:26:11 +0200 Original-Received: from localhost ([::1]:51919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb8Ik-0002Et-HA for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 09:26:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb8Ia-0002ET-C2 for emacs-devel@gnu.org; Mon, 06 Oct 2014 09:26:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xb8IR-0005gT-9W for emacs-devel@gnu.org; Mon, 06 Oct 2014 09:26:00 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:29648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb8IR-0005g0-6R; Mon, 06 Oct 2014 09:25:51 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNFxKjo/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kLodWCNIZF456B4Q4BKkZgWqDTCE X-IPAS-Result: ArUGAIDvNVNFxKjo/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kLodWCNIZF456B4Q4BKkZgWqDTCE X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="91782936" Original-Received: from 69-196-168-232.dsl.teksavvy.com (HELO pastel.home) ([69.196.168.232]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 06 Oct 2014 09:25:50 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id BC3A285CC; Mon, 6 Oct 2014 09:25:49 -0400 (EDT) In-Reply-To: (Glenn Morris's message of "Mon, 06 Oct 2014 02:37:30 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:175013 Archived-At: > Yet more branches sounds more complicated to me (doesn't that mean you > need to know when you make a change where it should go?), One way or another, someone will have to decide which change goes "in the current pretest" (let's call it 24.4), "in the next bug-fix" (let's call it 24.5), or "longer term" (let's call it 25.1). If the committer knows before committing where that change should go, then having 3 branches and committing to the proper branch is the best solution. If that's not the case, then having 3 branches doesn't help, indeed, since the commit will have to be backported to the proper branch, if applicable. Note that this "backporting" will take place regardless of whether we have 3 branches active at a time or not. Having 3 branches active at a time, does allow the backporting to be done any time you want, whereas sticking to the "trunk vs emacs-24" scheme we have simply means that some of the backporting will only take place once the "emacs-24" branch is changed from "branch for 24.4" to "branch for 24.5". Stefan