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: Tue, 03 Apr 2012 00:54:49 +0200 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> <83y5qec658.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333407304 2629 80.91.229.3 (2 Apr 2012 22:55:04 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Apr 2012 22:55:04 +0000 (UTC) Cc: Eli Zaretskii , cyd@gnu.org, emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 00:55:03 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 1SEq9O-0001EH-6v for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 00:55:02 +0200 Original-Received: from localhost ([::1]:47885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEq9N-00047r-IV for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 18:55:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEq9K-00047Q-P4 for emacs-devel@gnu.org; Mon, 02 Apr 2012 18:55:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEq9J-0001TB-57 for emacs-devel@gnu.org; Mon, 02 Apr 2012 18:54:58 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:40316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEq9E-0001QX-Jw; Mon, 02 Apr 2012 18:54:52 -0400 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VM7zt13Hqz3hhXj; Tue, 3 Apr 2012 00:54:50 +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 3VM7zt0rn5z4KK43; Tue, 3 Apr 2012 00:54:50 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id C3A97CA2A9; Tue, 3 Apr 2012 00:54:49 +0200 (CEST) X-Yow: Th' PINK SOCK... soaking... soaking... soaking... Th' PINK SOCK... washing... washing... washing... Th' PINK SOCK... rinsing... rinsing... rinsing... In-Reply-To: (Juanma Barranquero's message of "Tue, 3 Apr 2012 00:43:47 +0200") 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.10 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:149311 Archived-At: Juanma Barranquero writes: > In absolute terms, you're right. But Eli's argument is, I think, that > the state of the trunk is more important. Having a worse trunk's > history in exchange of a cleaner release branch's history is a net > loss because we do, on the long term, orders of magnitude more work > with the trunk that the release branch. Particularly "historical > research" to determine when/how/why/by-whom an old change was done. For this purpose a proper merge is far superior to a cherry-pick. 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."