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: rebasing Date: Thu, 28 Jan 2010 00:08:18 -0500 Message-ID: <87bpgestod.fsf@red-bean.com> References: <87iqannget.fsf@catnip.gol.com> 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 1264655317 22374 80.91.229.12 (28 Jan 2010 05:08:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 05:08:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 06:08:34 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.69) (envelope-from ) id 1NaMcL-00005B-Av for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 06:08:33 +0100 Original-Received: from localhost ([127.0.0.1]:59241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaMcK-0003DM-Oa for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 00:08:32 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaMcF-0003DH-Nu for emacs-devel@gnu.org; Thu, 28 Jan 2010 00:08:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaMcA-0003A1-Dk for emacs-devel@gnu.org; Thu, 28 Jan 2010 00:08:26 -0500 Original-Received: from [199.232.76.173] (port=37267 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaMcA-00039u-AN for emacs-devel@gnu.org; Thu, 28 Jan 2010 00:08:22 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:54053) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NaMc8-0005YG-DH; Thu, 28 Jan 2010 00:08:20 -0500 Original-Received: from localhost ([127.0.0.1]:45152 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NaMc6-0007Os-IY; Wed, 27 Jan 2010 23:08:18 -0600 In-Reply-To: <87iqannget.fsf@catnip.gol.com> (Miles Bader's message of "Thu, 28 Jan 2010 10:53:46 +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:120542 Archived-At: Miles Bader writes: >[I posted this question to a thread in the ding (gnus) list, but thought >I'd ask it here too.] > >One thing that concerns me is the anti-rebasing dogma that one hears >from canonical. Does anybody know if it's just dogma, or does bzr >actually have technical problems with rebasing? > >I ask because for the common small random commits case, it seems _much_ >better to just commit to the trunk locally and rebase these local >commits on pulling from the main repository; the "keep N branches and >merge back and forth, even for trivial commits" recipe that is >apparently advocated for emacs seems like a huge annoyance. I strongly recommend asking this question on the Bazaar list. The answers you get from the ding (gnus) list and from the Emacs list will be heartfelt, I'm sure, but may miss some technicality that turns out to be important.