From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merging Org 7.8.02 before Emacs 24.1 Date: Sat, 31 Dec 2011 09:27:13 +0100 Message-ID: <877h1df8ny.fsf@altern.org> References: <877h1ncs1u.fsf@altern.org> <87ipl3g4jr.fsf@gnu.org> <87vcp3hfuh.fsf@gnu.org> <87boqshtul.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1325319979 5020 80.91.229.12 (31 Dec 2011 08:26:19 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 31 Dec 2011 08:26:19 +0000 (UTC) Cc: "Jambunathan K." , schulte eric , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 31 09:26:15 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RguGc-00051e-EN for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 09:26:14 +0100 Original-Received: from localhost ([::1]:51340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RguGb-0000pY-UW for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 03:26:13 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:57794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RguGZ-0000lD-4w for emacs-devel@gnu.org; Sat, 31 Dec 2011 03:26:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RguGY-0000UJ-4d for emacs-devel@gnu.org; Sat, 31 Dec 2011 03:26:11 -0500 Original-Received: from mail-wi0-f169.google.com ([209.85.212.169]:53162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RguGW-0000Tp-4s; Sat, 31 Dec 2011 03:26:08 -0500 Original-Received: by wibhq12 with SMTP id hq12so9932735wib.0 for ; Sat, 31 Dec 2011 00:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=SsCf5G5ahg2CiKFeJ/o5/nB5pr2swlmIyczyKRmeiS8=; b=grBKcrTrbkBqcE3XePGbvTzQRwTsF7G2mVy3VgJO/Eyy3+QmR9aoY34AFiW7yOQq/t SGgG0ETbKfsjgZjSQ933jMFiHGyNNRmvVU4DXgueow0QEqHbO1c0du/prS79oZdwYpih JhmMc3ukzGP698HFDAti/BprxP78cdn1VI9Rk= Original-Received: by 10.180.19.74 with SMTP id c10mr91865121wie.8.1325319967188; Sat, 31 Dec 2011 00:26:07 -0800 (PST) Original-Received: from myhost.localdomain (175.152.71.86.rev.sfr.net. [86.71.152.175]) by mx.google.com with ESMTPS id fg15sm42415592wbb.7.2011.12.31.00.26.06 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 31 Dec 2011 00:26:06 -0800 (PST) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 9634613F2F; Sat, 31 Dec 2011 09:27:13 +0100 (CET) In-Reply-To: <87boqshtul.fsf@gnu.org> (Chong Yidong's message of "Thu, 29 Dec 2011 12:42:10 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.169 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:147078 Archived-At: Chong Yidong writes: > Bastien writes: > >> IMHO the feature freeze would make more sense if there was a deadline >> for the Emacs release. Is there one? > > There is no deadline. It will take at least a few more months, but we > are close enough that a further Org merge after this one will most > likely be unacceptable, unless it is purely bug fixes. I'll leave it to you and the Emacs team to judge whether those new features are acceptable or not during the feature freeze. I guess it all depends on the features themselves (probably small ones for 7.9) and the deadline. > If you guys are continuing to add features upstream, I recommend setting > up a bugfix-only branch or some other setup for channeling upstream bug > fixes into the Emacs trunk, for the duration of the Emacs pretest. This is what I will try to do from now on: the Org master branch is for development and the maint branch is for bug fixes. But there is a problem: each time there is a new Org major release, the master branch is merged on the maint branch. If new bug fixes are done after the major release, how should I merge them into Emacs? I can think of two solutions: (1) have an emacs-maint branch containing bug fixes for the last Org version that has been merged into Emacs; the master branch will be merged on that branch only when the major release of Org is merged into Emacs; (2) don't merge bug fixes that happen after a new major release during the feature freeze. Unless someone come up with a better (simpler) proposal, I will perhaps try (1) -- if that's too much work, I will fall back on (2). Best, -- Bastien