From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Wed, 13 Jan 2010 12:23:27 +0900 Message-ID: <878wc23cy8.fsf@uwakimon.sk.tsukuba.ac.jp> References: <4B4B93AB.3030903@gnu.org> <87skac1fy7.fsf@telefonica.net> <4B4C28F6.9000209@swipnet.se> <87ockz1ztm.fsf@telefonica.net> <4B4C4360.2040707@swipnet.se> <87fx6a3fyn.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263352511 12421 80.91.229.12 (13 Jan 2010 03:15:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Jan 2010 03:15:11 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , Jan =?iso-8859-1?Q?Dj=E4rv?= , emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 13 04:15:03 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NUthF-0004sY-VR for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2010 04:15:02 +0100 Original-Received: from localhost ([127.0.0.1]:51101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUthG-0002jz-EE for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 22:15:02 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUthA-0002ik-7D for emacs-devel@gnu.org; Tue, 12 Jan 2010 22:14:56 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUth5-0002gO-KA for emacs-devel@gnu.org; Tue, 12 Jan 2010 22:14:55 -0500 Original-Received: from [199.232.76.173] (port=36242 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUth5-0002gG-Ec for emacs-devel@gnu.org; Tue, 12 Jan 2010 22:14:51 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:45865) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUth5-0001ib-2I for emacs-devel@gnu.org; Tue, 12 Jan 2010 22:14:51 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps01.sk.tsukuba.ac.jp (Postfix) with ESMTP id E3D631535B3; Wed, 13 Jan 2010 12:14:45 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id C11DD1A2C00; Wed, 13 Jan 2010 12:23:27 +0900 (JST) In-Reply-To: X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" 1444e28f1a3d XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119890 Archived-At: Juanma Barranquero writes: > On Wed, Jan 13, 2010 at 03:18, Stephen J. Turnbull wrote: > > > But this isn't about "general", it's about a workflow where "bzr > > merge" is considered too painful. > > Not bzr merge, but make bootstrap No, I really meant "bzr merge". AIUI people were discussing the quickfixes branch, not feature branches. The claim has been that spending 15 seconds (in most cases) making a trivial merge to trunk before pushing is too annoying. If that's unacceptable, even five minutes spent on an unnecessary bootstrap clearly would be too. (Aside: the emphasis in recent threads on the importance of streamlining the quickfixes workflow scares me.)