From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Mon, 02 Apr 2012 21:12:46 -0400 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; charset=us-ascii X-Trace: dough.gmane.org 1333415576 21774 80.91.229.3 (3 Apr 2012 01:12:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 01:12:56 +0000 (UTC) Cc: Eli Zaretskii , cyd@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 03:12:55 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 1SEsIp-0000f9-3a for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 03:12:55 +0200 Original-Received: from localhost ([::1]:47310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsIo-0000yK-6Y for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 21:12:54 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsIl-0000xu-2q for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:12:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEsIj-0005RL-4y for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:12:50 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:57617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsIj-0005RG-1P for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:12:49 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SEsIg-00061t-KN; Mon, 02 Apr 2012 21:12:46 -0400 X-Spook: Exon Shell COSCO FBI ANDVT Verisign PET encryption X-Ran: sZ8#wWcWb6;GgCz`GSbYsLNN\TE#tWn^Tthq`4CBGwryAWjGHVlmg^d,wy}RFPAP5zPPkC X-Hue: black X-Attribution: GM In-Reply-To: (Andreas Schwab's message of "Tue, 03 Apr 2012 00:44:31 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.10 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:149313 Archived-At: Andreas Schwab wrote: > 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. Not as I envisage it; or (tried to) describe it. If we could do what you seem to be saying, then we could just do that when merging from release branch to trunk, and the issue that started this discussion would not arise in the first place. But we can't, because bzr does not track cherry-picked revisions. (IIUC, etc, etc).