From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Next release Date: Fri, 02 May 2008 01:04:34 +0100 Message-ID: <481A5A92.2010807@gnu.org> References: <18457.37369.262079.668907@kahikatea.snap.net.nz> <48199C58.9070503@gnu.org> <18458.19742.178728.98303@kahikatea.snap.net.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1209686725 23629 80.91.229.12 (2 May 2008 00:05:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 2 May 2008 00:05:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nick Roberts Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 02 02:06:01 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JrimL-0008Dm-Qb for ged-emacs-devel@m.gmane.org; Fri, 02 May 2008 02:05:49 +0200 Original-Received: from localhost ([127.0.0.1]:35841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jrild-00088z-Lt for ged-emacs-devel@m.gmane.org; Thu, 01 May 2008 20:04:49 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JrilZ-00088j-Ht for emacs-devel@gnu.org; Thu, 01 May 2008 20:04:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JrilX-00088W-Kz for emacs-devel@gnu.org; Thu, 01 May 2008 20:04:44 -0400 Original-Received: from [199.232.76.173] (port=45916 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JrilX-00088T-IJ for emacs-devel@gnu.org; Thu, 01 May 2008 20:04:43 -0400 Original-Received: from mk-outboundfilter-4.mail.uk.tiscali.com ([212.74.114.32]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JrilX-00043h-31 for emacs-devel@gnu.org; Thu, 01 May 2008 20:04:43 -0400 Original-X-Trace: 72720756/mk-outboundfilter-2.mail.uk.tiscali.com/F2S/$ACCEPTED/freedom2Surf-customers/83.67.23.108 X-SBRS: None X-RemoteIP: 83.67.23.108 X-IP-MAIL-FROM: jasonr@gnu.org X-IP-BHB: Once X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArEEAAD4GUhTQxds/2dsb2JhbACBU6p5 X-IP-Direction: IN Original-Received: from i-83-67-23-108.freedom2surf.net (HELO wanchan.jasonrumney.net) ([83.67.23.108]) by smtp.f2s.tiscali.co.uk with ESMTP; 02 May 2008 01:04:42 +0100 Original-Received: from [192.168.249.27] (chiko.jasonrumney.net [192.168.249.27]) by wanchan.jasonrumney.net (Postfix) with ESMTP id 584C91D53; Fri, 2 May 2008 01:04:13 +0100 (BST) User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) In-Reply-To: <18458.19742.178728.98303@kahikatea.snap.net.nz> X-Enigmail-Version: 0.95.6 OpenPGP: id=8086879D X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:96301 Archived-At: Nick Roberts wrote: > > If bugs are present in EMACS_22_BASE, they should be fixed there. > > They should but the reality is that they aren't. It's more work to commit > changes to two separate branches So just commit them to the EMACS_22_BASE branch, and let the automated merge take care of them. If the code has diverged enough to upset the automated merge, then it probably isn't worth the effort of fixing in Emacs 22 unless the bug is serious, but for most bugs the merge should take care of things.