From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Tue, 03 Apr 2012 00:44:31 +0200 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> <83y5qec658.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333406689 31212 80.91.229.3 (2 Apr 2012 22:44:49 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Apr 2012 22:44:49 +0000 (UTC) Cc: Eli Zaretskii , cyd@gnu.org, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 00:44:48 2012 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 1SEpzT-0002iV-M2 for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 00:44:47 +0200 Original-Received: from localhost ([::1]:46658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEpzQ-0002xs-Rg for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 18:44:44 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEpzN-0002xb-EJ for emacs-devel@gnu.org; Mon, 02 Apr 2012 18:44:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEpzL-0007VZ-QN for emacs-devel@gnu.org; Mon, 02 Apr 2012 18:44:40 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:46849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEpzH-0007Uo-56; Mon, 02 Apr 2012 18:44:35 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VM7m03M7Wz4Kn9G; Tue, 3 Apr 2012 00:44:32 +0200 (CEST) Original-Received: from igel.home (ppp-93-104-152-142.dynamic.mnet-online.de [93.104.152.142]) by mail.mnet-online.de (Postfix) with ESMTPA id 3VM7m01v8Xz4KK3j; Tue, 3 Apr 2012 00:44:32 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id E6322CA2A9; Tue, 3 Apr 2012 00:44:31 +0200 (CEST) X-Yow: Barbie says, Take quaaludes in gin and go to a disco right away! But Ken says, WOO-WOO!! No credit at ``Mr. Liquor''!! In-Reply-To: (Glenn Morris's message of "Mon, 02 Apr 2012 18:20:42 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 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:149309 Archived-At: Glenn Morris writes: > The new proposal is presumably to commit everything on the trunk, and > label those things that need to also go to the release branch in some > way (eg "merge to emacs-24 branch"). Then use bzrmerge.el to merge from > trunk to branch, skipping everything not so labelled. This would work. That wouldn't be merges any more, but a series of cherry-picks. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."