From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Sat, 07 Apr 2012 09:33:56 +0300 Message-ID: <83wr5s9hkb.fsf@gnu.org> 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> <87bon4b7hd.fsf@wanadoo.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1333780571 19964 80.91.229.3 (7 Apr 2012 06:36:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 7 Apr 2012 06:36:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 07 08:36:10 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 1SGPFp-0006BQ-WF for ged-emacs-devel@m.gmane.org; Sat, 07 Apr 2012 08:36:10 +0200 Original-Received: from localhost ([::1]:60551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGPFo-0002kr-Sb for ged-emacs-devel@m.gmane.org; Sat, 07 Apr 2012 02:36:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGPFl-0002km-7W for emacs-devel@gnu.org; Sat, 07 Apr 2012 02:36:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGPFj-0006dc-HG for emacs-devel@gnu.org; Sat, 07 Apr 2012 02:36:04 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:41286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGPFj-0006dX-8T for emacs-devel@gnu.org; Sat, 07 Apr 2012 02:36:03 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0M2300D00JE5U200@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 07 Apr 2012 09:36:01 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.252.114]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M2300DPBJNXT930@a-mtaout23.012.net.il>; Sat, 07 Apr 2012 09:35:58 +0300 (IDT) In-reply-to: <87bon4b7hd.fsf@wanadoo.es> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.175 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:149450 Archived-At: > From: =D3scar Fuentes > Date: Sat, 07 Apr 2012 04:28:46 +0200 >=20 > Eli Zaretskii writes: >=20 > [snip] >=20 > > FWIW, I like having separate branches. At least for Emacs, and f= or > > 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 switc= hing > > branches needs to make a lot of changes, and requires a large bui= ld if > > not a full bootstrap. >=20 > 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. > 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/Linu= x as well, so that's not the main reason. > On addition, when I switch branches from Emacs the relevant functio= n is > advised for storing timestamps of the files of the current branch b= efore > the switch and recover the timestamps of the new branch's files aft= er > the switch, so no rebuild is triggered because some source file was > modified by the switch when the new branch already has an associate= d 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. In any case, if you have branches in separate directories, you get that for free. > 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= .