From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Wed, 04 Apr 2012 13:41:59 -0400 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> <83y5qec658.fsf@gnu.org> <83mx6sd6vt.fsf@gnu.org> <83ehs3ct46.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333561347 3265 80.91.229.3 (4 Apr 2012 17:42:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 4 Apr 2012 17:42:27 +0000 (UTC) Cc: cyd@gnu.org, schwab@linux-m68k.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 04 19:42: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 1SFUDv-0006zm-5g for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 19:42:23 +0200 Original-Received: from localhost ([::1]:60248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFUDu-0002Xx-Hn for ged-emacs-devel@m.gmane.org; Wed, 04 Apr 2012 13:42:22 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFUDr-0002Xj-9V for emacs-devel@gnu.org; Wed, 04 Apr 2012 13:42:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFUDp-0005sA-QM for emacs-devel@gnu.org; Wed, 04 Apr 2012 13:42:18 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:32413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFUDf-0005o9-CN; Wed, 04 Apr 2012 13:42:07 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9FpZV7/2dsb2JhbACBX5x7eYhwnhmGGQSbGYQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="172138860" Original-Received: from 69-165-149-123.dsl.teksavvy.com (HELO pastel.home) ([69.165.149.123]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 04 Apr 2012 13:41:59 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 77E2459339; Wed, 4 Apr 2012 13:41:59 -0400 (EDT) In-Reply-To: <83ehs3ct46.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 04 Apr 2012 20:19:21 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.183 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:149378 Archived-At: > Yes, you do, at least what _I_ am talking about. I explained this at > least twice in the past: the history is all messed up on the trunk as > result of this. No, it's not messed up. Maybe you don't like it (not sure why), and maybe `bzr log' shows it in a weird or messed up way (in which case you should take it up with the bzr guys), but the history itself is very much not messed up at all. > You disagree with this being a problem, but I submit > that this is akin to saying that the history is not important. I care a lot about the VCS history metadata, which is why I insist that we merge from the release branch onto the trunk. > Maybe we should take a step back and ask ourselves why do we need to > merge from the stable branch to the trunk at all? Very simple: we want to make sure all the bug-fixes we install on the stable branch don't get lost on the next release, and we want to reflect this info into the VCS history so the VCS knows what's going on. Stefan