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: patch vs. overwrite in bzr Date: Sat, 07 Apr 2012 04:28:46 +0200 Message-ID: <87bon4b7hd.fsf@wanadoo.es> References: <87k42cwys8.fsf@gnu.org> <87aa2szgig.fsf@gnu.org> <87ehs4yrhz.fsf@gnu.org> <83k41vctyg.fsf@gnu.org> <83aa2rcnww.fsf@gnu.org> <8362dedgcb.fsf@gnu.org> <87zkapi7qe.fsf@gnu.org> <83iphdb6dp.fsf@gnu.org> <878vi9gqst.fsf@gnu.org> <838vi9b2sr.fsf@gnu.org> <87lim9f9fx.fsf@gnu.org> <83zkaoa8gr.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333765749 8210 80.91.229.3 (7 Apr 2012 02:29:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 7 Apr 2012 02:29:09 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 07 04:29:07 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SGLOk-0001yg-7y for ged-emacs-devel@m.gmane.org; Sat, 07 Apr 2012 04:29:06 +0200 Original-Received: from localhost ([::1]:48160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGLOj-0005QZ-Hj for ged-emacs-devel@m.gmane.org; Fri, 06 Apr 2012 22:29:05 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGLOg-0005QI-OJ for emacs-devel@gnu.org; Fri, 06 Apr 2012 22:29:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGLOe-0006yL-VJ for emacs-devel@gnu.org; Fri, 06 Apr 2012 22:29:02 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:60255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGLOe-0006yE-OV for emacs-devel@gnu.org; Fri, 06 Apr 2012 22:29:00 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SGLOa-0001tC-V0 for emacs-devel@gnu.org; Sat, 07 Apr 2012 04:28:56 +0200 Original-Received: from 215.red-81-43-220.staticip.rima-tde.net ([81.43.220.215]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 07 Apr 2012 04:28:56 +0200 Original-Received: from ofv by 215.red-81-43-220.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 07 Apr 2012 04:28:56 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 215.red-81-43-220.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) Cancel-Lock: sha1:reiv3rfzovqhCQNF37FpGgRvqbs= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149445 Archived-At: Eli Zaretskii writes: [snip] > FWIW, I like having separate branches. At least for Emacs, and for > the use case when the changes in the branch are significant (like what > I had for bidi), co-located branches get in the way because switching > branches needs to make a lot of changes, and requires a large build if > not a full bootstrap. Use out-of-source builds, with a build directory per branch... unless that collides with Emacs' peculiar practice of putting build products on the source tree for out-of-source builds. On addition, when I switch branches from Emacs the relevant function is advised for storing timestamps of the files of the current branch before the switch and recover the timestamps of the new branch's files after the switch, so no rebuild is triggered because some source file was modified by the switch when the new branch already has an associated up to date build. > So having several branches sharing the same > tree does not gain much, and their disadvantage -- the possibility to > forget what branch is the current one and mess up -- is not worth that > gain. [snip] vc-git solves this by displaying the current branch name on the modeline. vc-bzr could do the same if colocated branches gain popularity.