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 13:56:50 +0200 Message-ID: <87398fbvr1.fsf@wanadoo.es> References: <87k42cwys8.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> <87bon4b7hd.fsf@wanadoo.es> <83wr5s9hkb.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333799829 4173 80.91.229.3 (7 Apr 2012 11:57:09 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 7 Apr 2012 11:57: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 13:57:09 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 1SGUGS-0006h1-JJ for ged-emacs-devel@m.gmane.org; Sat, 07 Apr 2012 13:57:08 +0200 Original-Received: from localhost ([::1]:49806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGUGS-0003Y6-3I for ged-emacs-devel@m.gmane.org; Sat, 07 Apr 2012 07:57:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGUGO-0003XW-SF for emacs-devel@gnu.org; Sat, 07 Apr 2012 07:57:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGUGN-0007Pl-3g for emacs-devel@gnu.org; Sat, 07 Apr 2012 07:57:04 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:41169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGUGM-0007Pf-T1 for emacs-devel@gnu.org; Sat, 07 Apr 2012 07:57:03 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SGUGJ-0006bB-6U for emacs-devel@gnu.org; Sat, 07 Apr 2012 13:56:59 +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 13:56:59 +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 13:56:59 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 57 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:xn/IW4C+aPLA2iK/lGzVhF/6R5I= 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:149458 Archived-At: Eli Zaretskii writes: >> > 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... > > What for? I have no problems with the above arrangement. Joakim > asked how others arrange their branches, and I described mine. There > are no problems I have that would require me to change it. You mentioned some problems with colocated branches, and I described a method for avoiding them. I'm not trying to convince you to change anything. >> unless that collides with Emacs' peculiar practice of putting build >> products on the source tree for out-of-source builds. > > Nothing peculiar here: the Windows build simply doesn't support > out-of-source builds. But I build inside the source tree on GNU/Linux > as well, so that's not the main reason. The GNU/Linux build also puts products on the source tree (the .elc files). >> 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. > > IMO, this is a dangerous practice, because you cannot always > second-guess what needs to be rebuilt after the switch, what with all > the complex Makefile rules. There is nothing dangerous about that, because you don't need to second-guess. > In any case, if you have branches in separate directories, you get > that for free. This is for people who prefer to use colocated branches. >> vc-git solves this by displaying the current branch name on the >> modeline. vc-bzr could do the same if colocated branches gain >> popularity. > > You are assuming that I use VC to do my bzr operations. That's false. What you use for "bzr operations" have nothing to do with the information displayed on the modeline, which helps hackers who use colocated branches to know all the time which branch they are working on.