From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Tue, 12 Jan 2010 21:27:42 -0500 Message-ID: <87r5puspr5.fsf@red-bean.com> 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> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263349691 5506 80.91.229.12 (13 Jan 2010 02:28:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Jan 2010 02:28:11 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , Juanma Barranquero , Jan =?utf-8?Q?Dj=C3=A4rv?= , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 13 03:28: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 1NUsxn-0007RU-5l for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2010 03:28:03 +0100 Original-Received: from localhost ([127.0.0.1]:45927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUsxn-0006rw-TP for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 21:28:03 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUsxi-0006rr-QA for emacs-devel@gnu.org; Tue, 12 Jan 2010 21:27:58 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUsxd-0006oM-72 for emacs-devel@gnu.org; Tue, 12 Jan 2010 21:27:57 -0500 Original-Received: from [199.232.76.173] (port=40345 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUsxd-0006oI-0N for emacs-devel@gnu.org; Tue, 12 Jan 2010 21:27:53 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:41970) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NUsxc-00027Q-NA for emacs-devel@gnu.org; Tue, 12 Jan 2010 21:27:52 -0500 Original-Received: from localhost ([127.0.0.1]:38826 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NUsxX-0004qd-5p; Tue, 12 Jan 2010 20:27:47 -0600 In-Reply-To: <87fx6a3fyn.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Wed, 13 Jan 2010 11:18:24 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119889 Archived-At: "Stephen J. Turnbull" writes: >FWIW, the real reason that we didn't say anything about it is that the >original idea was that the trunk would be treeless, but it turns out >that you can't merge a branch without a tree. (It's not impossible in >theory -- eg, if the divergent changes affect different files -- but >bzr won't do it.) I think it was that, and a desire not to throw too many different ways of doing things at newbies. But at this point, I think we could update the BzrForEmacsDevs doc to recommend just doing trivial mods in trunk and committing directly from there. Heck, that's what I'm doing with really simple stuff. Can anyone think of any gotchas? Particularly gotchas that would lead to people on this list having to provide more support not less? :-)