From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: rebasing Date: Thu, 28 Jan 2010 12:33:45 +0100 Message-ID: <877hr2v4yu.fsf@telefonica.net> References: <87iqannget.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264678560 21863 80.91.229.12 (28 Jan 2010 11:36:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 11:36:00 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 12:35:56 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 1NaSfE-0007s0-Bv for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 12:35:56 +0100 Original-Received: from localhost ([127.0.0.1]:53087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaSfD-00070t-Oh for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 06:35:55 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaSde-000621-7L for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:34:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaSdW-0005ym-PR for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:34:14 -0500 Original-Received: from [199.232.76.173] (port=51952 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaSdW-0005yZ-AP for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:34:10 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:30028) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NaSdV-0004Jo-Qq for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:34:09 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaSdU-0008T1-D7 for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:34:09 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaSdS-0006oJ-IH for emacs-devel@gnu.org; Thu, 28 Jan 2010 12:34:06 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 12:34:06 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 12:34:06 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:GrVac2Bf/NO2Og9wh6XBx9acVuQ= X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120562 Archived-At: Miles Bader writes: [snip] In addition to what Stefan and Karl say... > 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'm having trouble figuring out which kind of workflow would benefit from this. Unless you work disconnected, or for some other reason wish to send upstream your quick fixes on batches, how would you benefit from `rebase'? If you work connected, just do your quick fixes on a branch bound to upstream, then you essentially do the same sequence of operations you used with CVS: update & commit, and everything with VC-dir. [Also, please note that the Rebase plugin for bzr does not support git's --interactive]