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: Fri, 06 Apr 2012 23:52:52 +0300 Message-ID: <83zkaoa8gr.fsf@gnu.org> References: <87k42cwys8.fsf@gnu.org> <87pqbpj5j3.fsf@altern.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333745715 8299 80.91.229.3 (6 Apr 2012 20:55:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 6 Apr 2012 20:55:15 +0000 (UTC) Cc: bzg@gnu.org, yandros@MIT.EDU, emacs-devel@gnu.org, rms@gnu.org, monnier@iro.umontreal.ca To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 06 22:55:13 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 1SGGBb-0005Pn-7t for ged-emacs-devel@m.gmane.org; Fri, 06 Apr 2012 22:55:11 +0200 Original-Received: from localhost ([::1]:41377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGGBa-0001un-Gz for ged-emacs-devel@m.gmane.org; Fri, 06 Apr 2012 16:55:10 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGGBX-0001rZ-0l for emacs-devel@gnu.org; Fri, 06 Apr 2012 16:55:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGGBT-0007hz-2q for emacs-devel@gnu.org; Fri, 06 Apr 2012 16:55:06 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:49643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGGBO-0007dp-Aq; Fri, 06 Apr 2012 16:54:58 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0M2200C00SLXQ500@a-mtaout23.012.net.il>; Fri, 06 Apr 2012 23:54:55 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.252.114]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M2200C12SRHOZ50@a-mtaout23.012.net.il>; Fri, 06 Apr 2012 23:54:55 +0300 (IDT) In-reply-to: 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:149438 Archived-At: > From: joakim@verona.se > Cc: Bastien , Eli Zaretskii , rms@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Fri, 06 Apr 2012 22:01:57 +0200 > > Bzr is okay for most things, except it lacks co-located branches As of v2.5.0 (the latest stable release), bzr supports co-located branches in the core, so no plugins are necessary. (I didn't use it, so I cannot share any experience.) > I tried the git-bzr git plugin for a while but that didn't work too > well because of bugs in bzr fastimport. When did you last try that? AFAIK, all the significant bugs are now fixed, and in fact bzr-git is bundled with the official release. For me, the main disadvantage of bzr-git is that the initial branch (a.k.a. clone) command is painfully slow, because bzr needs to convert all the git meta-data to bzr format. (After the initial branch creation, pulling is quite bearable.) But other than that, its integration with bzr is very good, and starting with bzr 2.5, you can clone all the branches, not just master, and pull separately from each branch. > This workflow is pretty convenient in Git with colocated > branches. AFAIK it is a planned feature for Bzr but it's not ready yet. The future is here, see above. You may wish to give it another try. > I feel I provide less Emacs patches than I could because of this lack. I > would be interested to know how other Emacs developers handle this > situation. Perhaps there is something I am missing? 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. 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. YMMV, of course.