From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: bzr workflow
Date: Mon, 11 Jan 2010 22:37:04 +0100 [thread overview]
Message-ID: <87skac1fy7.fsf@telefonica.net> (raw)
In-Reply-To: 4B4B93AB.3030903@gnu.org
Sam Steingold <sds@gnu.org> writes:
> http://www.emacswiki.org/emacs/BzrForEmacsDevs
> appears to indicate that I need to commit _twice_ for each change (with the
> same log message?):
This was extensively discussed here a few days ago.
> Workflow for a Quick Change
> ...
> bzr commit -m "Fix bla bla bla (closes Bug #1)."
>
> Merging Into the Upstream Master
> ...
> bzr merge
> bzr commit -m "Merge: fix bla bla bla (closes Bug #1)."
>
>
> 1. Am I the only one who thinks this is a little too convoluted?
No, you are not alone.
You can use
http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs
or a variation of it as described below.
There is something that I disagree with BzrForEmacsDevs: a quickfix that
requires more than one commit or that spans so long in time to warrant a
merge from upstream does not qualify as a quickfix for me.
For the people that works with the distributed workflow and thinks that
a quickfix should map to one and only one commit, there is an easy
solution: bind your quickfixes/ branch to upstream:
cd quickfixes/
bzr bind URL_TO_UPSTREAM/trunk
after this, your workflow for quick fixes becomes:
bzr up
bzr commit -m "Fix bla bla bla (closes Bug #1)."
and you can use VC-dir all along.
[snip]
--
Óscar
next prev parent reply other threads:[~2010-01-11 21:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-11 21:10 bzr workflow Sam Steingold
2010-01-11 21:35 ` Andreas Schwab
2010-01-11 21:57 ` Sam Steingold
2010-01-11 23:05 ` Andreas Schwab
2010-01-11 21:37 ` Óscar Fuentes [this message]
2010-01-11 22:13 ` Chong Yidong
2010-01-12 7:47 ` Jan Djärv
2010-01-12 8:40 ` Óscar Fuentes
2010-01-12 9:39 ` Jan Djärv
2010-01-12 9:48 ` Óscar Fuentes
2010-01-12 19:41 ` Eli Zaretskii
2010-01-13 7:24 ` Jan D.
2010-01-13 0:01 ` Juanma Barranquero
2010-01-13 2:18 ` Stephen J. Turnbull
2010-01-13 2:16 ` Juanma Barranquero
2010-01-13 3:23 ` Stephen J. Turnbull
2010-01-13 3:29 ` Lennart Borgman
2010-01-13 4:18 ` Eli Zaretskii
2010-01-13 4:56 ` Lennart Borgman
2010-01-13 8:48 ` Stephen J. Turnbull
2010-01-13 3:53 ` Juanma Barranquero
2010-01-13 2:27 ` Karl Fogel
2010-01-13 4:02 ` Stephen J. Turnbull
2010-01-13 4:20 ` Eli Zaretskii
2010-01-13 16:55 ` Karl Fogel
2010-01-13 4:17 ` Eli Zaretskii
2010-01-13 8:31 ` Óscar Fuentes
2010-01-12 19:35 ` Eli Zaretskii
2010-01-11 22:08 ` Eli Zaretskii
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=87skac1fy7.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.org \
/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.