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:26:08 -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 1333416379 26298 80.91.229.3 (3 Apr 2012 01:26:19 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 01:26:19 +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:26:18 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 1SEsVl-0000mG-8s for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 03:26:17 +0200 Original-Received: from localhost ([::1]:50554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsVk-0003Vm-Je for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 21:26:16 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsVi-0003VT-2P for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:26:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEsVe-0000Xt-TO for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:26:13 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:57915) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEsVe-0000Xp-Q6 for emacs-devel@gnu.org; Mon, 02 Apr 2012 21:26:10 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SEsVc-00016p-AZ; Mon, 02 Apr 2012 21:26:08 -0400 X-Spook: Gazprom Mahmoud Ahmadinejad encryption UOP target Crypto X-Ran: ,Ma)%ZCRq`e5=DH[8;j0::Ohvh~~Z/ZVrj4Lc,TU>);ZMwRx@$^$8W%8J`I[%}%|[xR^,V X-Hue: cyan X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Mon, 02 Apr 2012 21:12:46 -0400") 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:149314 Archived-At: Glenn Morris wrote: >>> 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. PS If you are not familiar with bzrmerge.el, the whole point is that it does a real merge, then does some tricks to get an effect akin to cherry-picking. Maybe the idea was to merge from trunk to release-branch some other way, but I don't know what way that would be.