From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Sat, 2 Jan 2010 14:17:51 +0100 Message-ID: References: <87bphengwq.fsf@uwakimon.sk.tsukuba.ac.jp> <87fx6pi6k0.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262438312 11264 80.91.229.12 (2 Jan 2010 13:18:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Jan 2010 13:18:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 02 14:18:25 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 1NR3s7-00034I-Ls for ged-emacs-devel@m.gmane.org; Sat, 02 Jan 2010 14:18:23 +0100 Original-Received: from localhost ([127.0.0.1]:48022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NR3s7-0000tK-Lu for ged-emacs-devel@m.gmane.org; Sat, 02 Jan 2010 08:18:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NR3s2-0000t1-Bo for emacs-devel@gnu.org; Sat, 02 Jan 2010 08:18:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NR3rx-0000sW-CT for emacs-devel@gnu.org; Sat, 02 Jan 2010 08:18:17 -0500 Original-Received: from [199.232.76.173] (port=34425 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NR3rx-0000sT-4z for emacs-devel@gnu.org; Sat, 02 Jan 2010 08:18:13 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:60045) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NR3rw-0000Pm-U5 for emacs-devel@gnu.org; Sat, 02 Jan 2010 08:18:13 -0500 Original-Received: by bwz7 with SMTP id 7so9568497bwz.26 for ; Sat, 02 Jan 2010 05:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=mKpV1TEPDk51krX/NIiSFaXFy8+afAYppn96sKnwKoo=; b=Us0pSeyFa39wvbqf+UVrGdr0keH2e5uM8vM+BIlAdtw+Mp/ZDq8A02P0FC3GeuhxiW lkkJVDtlB0EMiEI+Qc8UaX2H4P+YQKoWtlUXqJIMK7dEJjJp8E/RatEyPVt+RVVoF6Fq RhWh11Ta/Xu6/+lS/08scfdwVLah2uTbBhBgI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=MDfNT4YEm8xUIPidtemIEGX8ZvPclk+Ak0zwOTNA+DGPKLcoj96o/HtEu+ydex8uzc mEwzVHtvyk7WCuAG5gsC3Rrx3eI2QMukbmQJHI4cjLNwxqJs5wU1b5YHJjrUEtpDItmx WgPVTc95zWIRa5+p+RSjY5or9MsbCNbhlWk5Q= Original-Received: by 10.204.154.208 with SMTP id p16mr8315074bkw.80.1262438291138; Sat, 02 Jan 2010 05:18:11 -0800 (PST) In-Reply-To: <87fx6pi6k0.fsf@telefonica.net> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:119273 Archived-At: On Sat, Jan 2, 2010 at 03:28, =C3=93scar Fuentes wrote: > OTOH, some people emulate colocated branches with `bzr switch'. It works like a charm. > Note that, within a shared repository, you can organize your branches as > you wish, so it is advisable to make a directory `delayed-changes' and > create your mini-feature branches there. The fact that the branch for "bzr switch BRANCH" can be relative to the parent dir makes this even easier. It'd be worth documenting this somewhere to give it this higher visibility, IMO, than a single paragraph in bzr help checkouts: Another possible use for a checkout is to use it with a treeless reposi= tory containing your branches, where you maintain only one working tree by switching the master branch that the checkout points to when you want t= o work on a different branch. BTW, what's the use of "branch --switch"? Something like this: # trunk/ (main mirror) # my-playground/ ("working" checkout) # delayed-changes/branch1, branch2, etc. (treeless branches) # from my-playground bzr branch --no-tree --switch ../trunk ../delayed-changes/branchN so you create a new branch and switch to it in a single op? Sweet, worth of an alias. Juanma