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: feature freeze decision needed + bzr cherrypick? Date: Sat, 29 Dec 2012 20:31:01 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1356831069 14040 80.91.229.3 (30 Dec 2012 01:31:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 30 Dec 2012 01:31:09 +0000 (UTC) Cc: Emacs-Devel devel To: Fabian Ezequiel Gallina Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 30 02:31:25 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 1Tp7kL-00022a-7B for ged-emacs-devel@m.gmane.org; Sun, 30 Dec 2012 02:31:25 +0100 Original-Received: from localhost ([::1]:41087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tp7k6-0004e8-GD for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 20:31:10 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tp7k3-0004ds-8L for emacs-devel@gnu.org; Sat, 29 Dec 2012 20:31:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tp7jy-000652-K6 for emacs-devel@gnu.org; Sat, 29 Dec 2012 20:31:07 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tp7jy-00064y-GN for emacs-devel@gnu.org; Sat, 29 Dec 2012 20:31:02 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Tp7jx-0008Mw-KI; Sat, 29 Dec 2012 20:31:01 -0500 X-Spook: White House 64 Vauxhall Cross digicash Albanian Dick X-Ran: Os:]y]}].LsbD1_gSY"o4k)= (Fabian Ezequiel Gallina's message of "Sat, 29 Dec 2012 10:16:04 -0300") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:156008 Archived-At: Fabian Ezequiel Gallina wrote: > Today I just pushed two commits to the trunk that fix some bugs > reported in the github bugtracker. Although I'm not sure if these > bugs were originally regressions I think they are pretty elegible > to be merged in the emacs 24 branch (especially the traceback > mixup one): > > 1) https://github.com/fgallina/python.el/issues/122 > 2) https://github.com/fgallina/python.el/issues/123 Fine by me to put these in emacs-24. Please give the new defcustom a :version "24.3" tag. (I did wonder if the entire python defgroup should just get such a tag, since it is essentially a new mode.) > Now considering these are merged into the trunk, in the case any > of these is accepted to be put into the emacs-24 branch how would > I proceed to do such thing? Is there anything similar to git's > cherrypick? 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).