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: Thu, 05 Apr 2012 11:44:49 -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> <83d37ncob5.fsf@gnu.org> <837gxudgko.fsf@gnu.org> <83398icjje.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333654828 28800 80.91.229.3 (5 Apr 2012 19:40:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Apr 2012 19:40:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 05 21:40:26 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 1SFsXf-0007v0-Vb for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 21:40:24 +0200 Original-Received: from localhost ([::1]:36862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFsVY-0002WC-IQ for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 15:38:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFos6-0001Wj-6E for emacs-devel@gnu.org; Thu, 05 Apr 2012 11:45:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFos0-000643-3c for emacs-devel@gnu.org; Thu, 05 Apr 2012 11:45:13 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:24324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SForq-0005xK-MO; Thu, 05 Apr 2012 11:44:58 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9soXRj/2dsb2JhbACBX5x7eYhwnhmGGQSbGYQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="172299059" Original-Received: from 108-161-116-99.dsl.teksavvy.com (HELO pastel.home) ([108.161.116.99]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 05 Apr 2012 11:44:50 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 0EA2059388; Thu, 5 Apr 2012 11:44:50 -0400 (EDT) In-Reply-To: <83398icjje.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 05 Apr 2012 17:58:29 +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.181 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:149409 Archived-At: >> >> But that depends on not forgetting to install it on both sides, >> >> which is error prone and is more work than installing only once on >> >> the release branch and merging later since merging can be batched >> >> and largely automated. >> > How is it more error prone or more work? >> I think that's pretty obvious: more error prone because you have to >> remember to do it > We could let bzrmerge.el "remember" to do it, can't we? bzrmerge does something completely different. >> and more work because it can't be batched (i.e. it's 2*N work, as >> opposed to N+M where M is the number of times you decide to "merge >> from branch"). > That's more work for the machine, not for the human, I think. No, I'm talking about more work for the human. In any case my decision is made on this matter. Stefan