From: Eli Zaretskii <eliz@gnu.org>
To: joakim@verona.se
Cc: bzg@gnu.org, yandros@MIT.EDU, emacs-devel@gnu.org, rms@gnu.org,
monnier@iro.umontreal.ca
Subject: Re: patch vs. overwrite in bzr
Date: Fri, 06 Apr 2012 23:52:52 +0300 [thread overview]
Message-ID: <83zkaoa8gr.fsf@gnu.org> (raw)
In-Reply-To: <m3haww4oju.fsf@chopper.vpn.verona.se>
> From: joakim@verona.se
> Cc: Bastien <bzg@gnu.org>, Eli Zaretskii <eliz@gnu.org>, 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.
next prev parent reply other threads:[~2012-04-06 20:52 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 13:28 Next pretest, and regressions policy Chong Yidong
2012-03-31 10:15 ` Bastien
2012-04-01 9:55 ` Bastien
2012-04-01 12:37 ` =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-01 13:30 ` Stefan Monnier
2012-04-01 17:09 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-02 4:12 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-03 8:20 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Roland Winkler
2012-04-03 12:36 ` Óscar Fuentes
2012-04-03 13:42 ` Bastien
2012-04-03 15:02 ` patch vs. overwrite in bzr =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-03 15:03 ` David Engster
2012-04-03 16:31 ` Stefan Monnier
2012-04-03 17:40 ` Michael Albinus
2012-04-03 15:32 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Stefan Monnier
2012-04-03 16:52 ` patch vs. overwrite in bzr Glenn Morris
2012-04-03 20:50 ` Bastien
2012-04-03 21:27 ` Glenn Morris
2012-04-04 0:26 ` Stefan Monnier
2012-04-04 5:45 ` Bastien
2012-04-04 5:51 ` Bastien
2012-04-04 6:46 ` Michael Albinus
2012-04-04 8:35 ` Thierry Volpiatto
2012-04-04 13:20 ` Stefan Monnier
2012-04-04 16:39 ` Jordi Gutiérrez Hermoso
2012-04-04 16:52 ` Paul Eggert
2012-04-04 17:09 ` Eli Zaretskii
2012-04-04 17:53 ` Thierry Volpiatto
2012-04-04 19:07 ` Eli Zaretskii
2012-04-04 19:38 ` Thierry Volpiatto
2012-04-04 20:12 ` Eli Zaretskii
2012-04-04 13:16 ` Stefan Monnier
2012-04-04 17:01 ` Eli Zaretskii
2012-04-04 18:07 ` Stefan Monnier
2012-04-04 19:11 ` Eli Zaretskii
2012-04-04 20:11 ` David Engster
2012-04-04 22:06 ` Stefan Monnier
2012-04-05 3:09 ` Eli Zaretskii
2012-04-05 13:22 ` Stefan Monnier
2012-04-05 15:24 ` Lars Magne Ingebrigtsen
2012-04-05 15:57 ` Eli Zaretskii
2012-04-05 17:10 ` Ted Zlatanov
2012-04-06 7:13 ` Richard Stallman
2012-04-06 8:29 ` Bastien
2012-04-06 8:40 ` Eli Zaretskii
2012-04-06 9:20 ` Bastien
2012-04-06 9:57 ` Eli Zaretskii
2012-04-06 10:20 ` Bastien
2012-04-06 17:26 ` chad
2012-04-06 20:01 ` joakim
2012-04-06 20:52 ` Eli Zaretskii [this message]
2012-04-07 2:28 ` Óscar Fuentes
2012-04-07 6:33 ` Eli Zaretskii
2012-04-07 11:56 ` Óscar Fuentes
2012-04-07 12:10 ` Eli Zaretskii
2012-04-07 12:56 ` Óscar Fuentes
2012-04-07 13:32 ` Eli Zaretskii
2012-04-07 13:42 ` Óscar Fuentes
2012-04-07 7:07 ` Andreas Schwab
2012-04-07 11:44 ` Óscar Fuentes
2012-04-06 21:10 ` Juanma Barranquero
2012-04-16 10:45 ` Jason Rumney
2012-04-16 16:38 ` Eli Zaretskii
2012-04-06 16:17 ` Christophe Poncy
2012-04-06 16:41 ` Eli Zaretskii
2012-04-06 17:14 ` Christophe Poncy
2012-04-07 0:17 ` Richard Stallman
2012-04-07 0:17 ` Richard Stallman
2012-04-07 9:15 ` Bastien
2012-04-07 22:19 ` Richard Stallman
2012-04-09 9:39 ` Bastien
2012-04-08 3:25 ` Richard Stallman
2012-04-08 15:52 ` Ted Zlatanov
2012-04-16 22:02 ` Richard Stallman
2012-04-06 8:43 ` Eli Zaretskii
2012-04-04 17:12 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Eli Zaretskii
2012-04-05 7:13 ` Bastien
2012-04-05 15:53 ` Eli Zaretskii
2012-04-11 14:36 ` Bastien
2012-04-04 18:01 ` Thierry Volpiatto
2012-04-05 7:19 ` Bastien
2012-04-05 9:16 ` Thierry Volpiatto
2012-04-01 20:35 ` Next pretest, and regressions policy Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83zkaoa8gr.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=joakim@verona.se \
--cc=monnier@iro.umontreal.ca \
--cc=rms@gnu.org \
--cc=yandros@MIT.EDU \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).