From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fabian Ezequiel Gallina Newsgroups: gmane.emacs.devel Subject: Re: feature freeze decision needed + bzr cherrypick? Date: Mon, 31 Dec 2012 16:35:57 -0300 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1356982570 10221 80.91.229.3 (31 Dec 2012 19:36:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 31 Dec 2012 19:36:10 +0000 (UTC) Cc: Emacs-Devel devel To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 31 20:36:24 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 1Tpl9q-0003V4-A7 for ged-emacs-devel@m.gmane.org; Mon, 31 Dec 2012 20:36:22 +0100 Original-Received: from localhost ([::1]:39155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tpl9b-00076f-GD for ged-emacs-devel@m.gmane.org; Mon, 31 Dec 2012 14:36:07 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:53811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tpl9Z-00076a-26 for emacs-devel@gnu.org; Mon, 31 Dec 2012 14:36:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tpl9Y-0003V7-7c for emacs-devel@gnu.org; Mon, 31 Dec 2012 14:36:05 -0500 Original-Received: from mail-ia0-f172.google.com ([209.85.210.172]:60702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tpl9S-0003UZ-Ur; Mon, 31 Dec 2012 14:35:59 -0500 Original-Received: by mail-ia0-f172.google.com with SMTP id z13so10864418iaz.3 for ; Mon, 31 Dec 2012 11:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=AHTbCC9860wMXQ8PWKBNej7L4SIvdXkljHbtd9yCix8=; b=rHKx5wc+phlIAM12Zu6Bb62bnfyfEN64QlAmgt0uldYr/cCtM8fKWLmkLyzqG5mLvg 6XMnuFsu1rIhauuudY9Kte0nacr6pUxwMw1urupdTre8yoVpU1HZ7UKvuXKblRkM6FXN exaIT3iqrSivDDM6ZjBsPfT7j0diAf+03Oy4zbWwGt5Hc+0r/tAx2YjGpk6z0a5qSsup S/K4oqe3IlVOshZysl0wOak5UC480TSknSLRI3MqqyQgaFkyIbVh/WfvXh0UD5xcXOZ+ Ep/mDRwe0ScT1nAQghwXs19PZxS1ZNcbp1Lq+2B42deMUudwdlixPNMyWZM0UT+A7Rns QneQ== Original-Received: by 10.50.152.240 with SMTP id vb16mr35510288igb.45.1356982557861; Mon, 31 Dec 2012 11:35:57 -0800 (PST) Original-Received: by 10.64.9.143 with HTTP; Mon, 31 Dec 2012 11:35:57 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.172 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:156037 Archived-At: 2012/12/29 Glenn Morris : > Fabian Ezequiel Gallina wrote: > > Eli already answered about "backport" being important. (It's generally > best to put things appropriate for emacs-24 in emacs-24 to start with, > then let them get merged to trunk "automatically".) > >> cd emacs-24 >> bzr merge -r 111365..111367 ../trunk > > Remember to float the ChangeLog entry to the top of the file, with the > appropriate date (bzr's changelog_merge plugin can do the first part). I just pushed this in revno 111102 and everything looks fine. Now for the :version tag I just updated the defgroup's :version to 24.3, so IIUC that should be enough. Thanks, Fabi=E1n