From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Thu, 05 Apr 2012 17:58:29 +0300 Message-ID: <83398icjje.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333639203 31900 80.91.229.3 (5 Apr 2012 15:20:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Apr 2012 15:20:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 05 17:20: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 1SFoTi-0005O3-Uu for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 17:20:03 +0200 Original-Received: from localhost ([::1]:54078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFo9X-0003ry-Fd for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 10:59:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFo9T-0003rm-MU for emacs-devel@gnu.org; Thu, 05 Apr 2012 10:59:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFo9H-0002NW-Ie for emacs-devel@gnu.org; Thu, 05 Apr 2012 10:59:07 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:60931) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFo9H-0002ND-Aj for emacs-devel@gnu.org; Thu, 05 Apr 2012 10:58:55 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0M2000C00H335C00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Thu, 05 Apr 2012 17:58:13 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.252.114]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M2000CLBHL02170@a-mtaout21.012.net.il>; Thu, 05 Apr 2012 17:58:13 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 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:149402 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Thu, 05 Apr 2012 09:17:52 -0400 > > >> 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? > 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.