From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Mon, 02 Apr 2012 20:43:40 +0200 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333392238 19168 80.91.229.3 (2 Apr 2012 18:43:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Apr 2012 18:43:58 +0000 (UTC) Cc: cyd@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 02 20:43:57 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 1SEmEO-00057e-W1 for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 20:43:57 +0200 Original-Received: from localhost ([::1]:40657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEmEO-0000VA-AT for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 14:43:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEmEL-0000V0-EK for emacs-devel@gnu.org; Mon, 02 Apr 2012 14:43:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEmEJ-0000QY-QY for emacs-devel@gnu.org; Mon, 02 Apr 2012 14:43:53 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:37432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEmEE-0000PG-Is; Mon, 02 Apr 2012 14:43:46 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VM2Q81zdqz4Kn8d; Mon, 2 Apr 2012 20:43:41 +0200 (CEST) Original-Received: from igel.home (ppp-93-104-152-142.dynamic.mnet-online.de [93.104.152.142]) by mail.mnet-online.de (Postfix) with ESMTPA id 3VM2Q50Rrtz4KKBg; Mon, 2 Apr 2012 20:43:41 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 90D33CA2A9; Mon, 2 Apr 2012 20:43:40 +0200 (CEST) X-Yow: I'm EMOTIONAL now because I have MERCHANDISING CLOUT!! In-Reply-To: <83zkauc96p.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 02 Apr 2012 20:53:02 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 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:149299 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: Chong Yidong , emacs-devel@gnu.org >> Date: Mon, 02 Apr 2012 19:21:55 +0200 >> >> Eli Zaretskii writes: >> >> > Could we _please_ do it the other way around this time? That is, >> > commit to the trunk and merge to the branch? >> >> How can that be correct? Most of the trunk commits are not supposed to >> occur on the release branch. > > As long as not all branch commits are merged to the trunk, we already > know how to cope with this problem. Merging always merges the complete history. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."