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: Installing changes from branches Date: Sat, 03 Apr 2010 16:19:23 +0200 Message-ID: <877hoozkic.fsf@telefonica.net> References: <87bpe1z57e.fsf@telefonica.net> <8339zdvwqj.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1270304388 13390 80.91.229.12 (3 Apr 2010 14:19:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 14:19:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 16:19:45 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 1Ny4CO-00083L-Ek for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 16:19:44 +0200 Original-Received: from localhost ([127.0.0.1]:42410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny4CN-00012w-Nu for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 10:19:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny4CI-00011o-VW for emacs-devel@gnu.org; Sat, 03 Apr 2010 10:19:39 -0400 Original-Received: from [140.186.70.92] (port=58677 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny4CH-00010n-N5 for emacs-devel@gnu.org; Sat, 03 Apr 2010 10:19:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny4CG-0004GR-SE for emacs-devel@gnu.org; Sat, 03 Apr 2010 10:19:37 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:51752) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny4CG-0004GI-LD for emacs-devel@gnu.org; Sat, 03 Apr 2010 10:19:36 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ny4CE-0007z1-V3 for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:19:34 +0200 Original-Received: from 83.32.114.13 ([83.32.114.13]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 03 Apr 2010 16:19:34 +0200 Original-Received: from ofv by 83.32.114.13 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 03 Apr 2010 16:19:34 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.32.114.13 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.93 (gnu/linux) Cancel-Lock: sha1:SLZuLpm8aG3LcmvujcyxOAXSWBY= X-detected-operating-system: by eggs.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:123120 Archived-At: Eli Zaretskii writes: >> And there is yet another solution, which is to bind the quickfixes >> branch to upstream. Instead of `bzr merge', do `bzr update'. When you >> finish a change, `bzr commit' will send it automatically upstream. > > But then why have a separate branch for that? This is precisely the > workflow in `trunk'. What am I missing? Although you can use `trunk' for that, I prefer to avoid overloading too much the purpose of things. `trunk' is your pristine upstream's mirror and the gateway for merging local changes into upstream. There are cases where using `trunk' for hacking can create inconveniences (not very serious incoveniences, though). For instance, if you begin hacking into something that seems easy but later discover that it is a deeper issue, turning `quickfixes' into a feature branch is trivial. If you were working on `trunk' you'll need to create a feature branch and merge `trunk's uncommitted changes into it, which may be tricky on some cases, as if you have new unregistered files. Another scenario that can be a bit tricky to handle if you use `trunk' for hacking is when you go off-line for a while and end accumulating a series of local commits of quickfixes on `trunk'