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: rebasing Date: Fri, 29 Jan 2010 00:06:50 +0900 Message-ID: <87y6jis1yt.fsf@xemacs.org> References: <87iqannget.fsf@catnip.gol.com> <877hr2v4yu.fsf@telefonica.net> <877hr29vru.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 1264690489 3888 80.91.229.12 (28 Jan 2010 14:54:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 14:54:49 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 15:54:42 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 1NaVlZ-0000mO-1K for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 15:54:41 +0100 Original-Received: from localhost ([127.0.0.1]:33513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaVlY-0007kR-7k for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 09:54:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaVlS-0007ja-FN for emacs-devel@gnu.org; Thu, 28 Jan 2010 09:54:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaVlO-0007iU-SW for emacs-devel@gnu.org; Thu, 28 Jan 2010 09:54:34 -0500 Original-Received: from [199.232.76.173] (port=44238 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaVlO-0007iI-MD for emacs-devel@gnu.org; Thu, 28 Jan 2010 09:54:30 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:42140) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaVlM-0007Ak-3R; Thu, 28 Jan 2010 09:54:28 -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 C4A771535AE; Thu, 28 Jan 2010 23:54:26 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 68A611A3506; Fri, 29 Jan 2010 00:06:50 +0900 (JST) In-Reply-To: <877hr29vru.fsf@catnip.gol.com> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" a03421eb562b 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:120584 Archived-At: Miles Bader writes: > Often the sort of commit I'm talking about is relatively short-lived and > ephemeral, but I usually do not want to commit to the central repo on > the spot, I'd rather commit stuff locally and let it live in my local > system for a while; I may or may not want to send it upstream or delete > it or whatever. You may want looms or pipelines, then. > A rebase-on-pull-style workflow, gives some of the immediacy of a pure > CVS-style workflow, but still allows local commits / disconnection > operation / etc. I.e.: good. The only way to do that in Bazaar as far as I know is to maintain a separate branch for your local changes. If you have multiple sets of such changes, you'll need multiple branches, one for each set. And you would do it not by pulling, but by merging from trunk into your branch. You'd probably need to cherrypick patches out of that, not rebase on to trunk (ie, sending stuff upstream will not get full support from the VCS).