From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: JD Smith Newsgroups: gmane.emacs.devel Subject: Pre-release commit etiquette Date: Wed, 25 Apr 2007 10:28:40 -0700 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Trace: sea.gmane.org 1177522157 15473 80.91.229.12 (25 Apr 2007 17:29:17 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 25 Apr 2007 17:29:17 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 25 19:29:10 2007 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 1HglIi-0005Ol-Tm for ged-emacs-devel@m.gmane.org; Wed, 25 Apr 2007 19:29:09 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HglOM-0006vD-KS for ged-emacs-devel@m.gmane.org; Wed, 25 Apr 2007 13:34:58 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HglOJ-0006uy-6Z for emacs-devel@gnu.org; Wed, 25 Apr 2007 13:34:55 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HglOH-0006uh-57 for emacs-devel@gnu.org; Wed, 25 Apr 2007 13:34:53 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HglOH-0006ue-2b for emacs-devel@gnu.org; Wed, 25 Apr 2007 13:34:53 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HglIc-0007Ez-HQ for emacs-devel@gnu.org; Wed, 25 Apr 2007 13:29:02 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1HglIM-00059j-8x for emacs-devel@gnu.org; Wed, 25 Apr 2007 19:28:46 +0200 Original-Received: from turtle.as.arizona.edu ([128.196.208.207]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 25 Apr 2007 19:28:46 +0200 Original-Received: from jdsmith by turtle.as.arizona.edu with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 25 Apr 2007 19:28:46 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: turtle.as.arizona.edu User-Agent: Pan/0.14.2.91 (As She Crawled Across the Table) X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) 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:70114 Archived-At: What are the rules for a commit pre-release? If you have a small bug fix for the release version, should it: 1. Be added to the branch EMACS_22_BASE, for later merger into HEAD. 2. Be added to both the branch and HEAD. 3. Be added to HEAD only, with a request to merge the change from HEAD->EMACS_22_BASE. 4. Be added to HEAD and held for a future release. If #3, who handles those requests? I suppose this depends on whether a new branch is going to be cut at the actual release point, in which case (I presume), all branch changes will be merged back. JD