From: Eli Zaretskii <eliz@gnu.org>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Installing changes from branches
Date: Sat, 03 Apr 2010 19:29:56 +0300 [thread overview]
Message-ID: <83aatk1ou3.fsf@gnu.org> (raw)
In-Reply-To: <87tyrsy248.fsf@telefonica.net>
> From: Óscar Fuentes <ofv@wanadoo.es>
> Date: Sat, 03 Apr 2010 17:41:59 +0200
>
> Yes. After the `bzr pull --overwrite' the quickfixes branch becomes
> identical to `trunk'. Hopefully, for quick fixes the local history is
> not something so valuable that you want to keep it around. Furthermore,
> a quick fix is usually made of a single commit, so you end mapping your
> local commit on `quickfixes' to a single commit on `trunk', which
> lessens the history loss.
If the fix takes only one commit, IMO it doesn't deserve a separate
branch.
FWIW, I have two kinds of branches that I use in different workflows:
. A feature branch, where I work on some really non-trivial
feature. The bidi branch is a good example. This kind of branch
lives for a relatively long time, and is not necessarily removed
when a feature is delivered (a.k.a. ``landed'') on the trunk --
because the delivery may very well be in several stages.
On this kind of branch, I merge back from the trunk as soon as I
deliver a feature to the trunk. Then I continue working on that
branch, until the next delivery.
The history of this kind of branch is very precious for me, and I
never want to lose it.
. A testing branch, where I test various small changes and features
before installing them on the trunk. The workflow on this kind of
branch usually goes like this:
cd ../test
bzr merge --pull
[hack away, test, hack some more, until ready to go public]
bzr diff > ../foo
cd ../trunk
bzr up
patch < ../foo
bzr ci -m "whatever"
[re-sync the branch with he trunk, be ready for the next hack]
cd ../test
bzr revert
bzr merge --pull
As you may have guessed, the history on this branch is not
important at all, once I deliver the changes to the trunk.
And no, I don't consider use of `patch' outside of bzr a sign that
something is wrong.
next prev parent reply other threads:[~2010-04-03 16:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-03 1:05 Installing changes from branches Stefan Monnier
2010-04-03 1:37 ` Óscar Fuentes
2010-04-03 7:08 ` Eli Zaretskii
2010-04-03 13:56 ` Stefan Monnier
2010-04-03 14:19 ` Óscar Fuentes
2010-04-03 15:08 ` Eli Zaretskii
2010-04-03 15:14 ` Óscar Fuentes
2010-04-03 15:54 ` Eli Zaretskii
2010-04-03 2:26 ` Juanma Barranquero
2010-04-03 8:56 ` Jan Djärv
2010-04-03 9:17 ` Stephen J. Turnbull
2010-04-03 14:08 ` Stefan Monnier
2010-04-03 14:30 ` Óscar Fuentes
2010-04-03 15:18 ` Jan Djärv
2010-04-03 15:41 ` Óscar Fuentes
2010-04-03 16:29 ` Eli Zaretskii [this message]
2010-04-03 16:49 ` Eli Zaretskii
2010-04-03 16:56 ` Óscar Fuentes
2010-04-03 20:53 ` Eli Zaretskii
2010-04-03 21:13 ` Óscar Fuentes
2010-04-03 19:14 ` Stefan Monnier
2010-04-03 19:31 ` Juanma Barranquero
2010-04-03 20:47 ` Eli Zaretskii
2010-04-03 22:57 ` Juri Linkov
2010-04-04 6:33 ` Eli Zaretskii
2010-04-04 11:03 ` Juri Linkov
2010-04-04 14:16 ` Stefan Monnier
2010-04-04 14:18 ` Stefan Monnier
2010-04-04 14:57 ` Eli Zaretskii
2010-04-05 14:02 ` Stefan Monnier
2010-04-04 14:58 ` Juanma Barranquero
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83aatk1ou3.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.