From: Eli Zaretskii <eliz@gnu.org>
To: "Jan Djärv" <jan.h.d@swipnet.se>
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
Subject: Re: bzr workflow
Date: Tue, 12 Jan 2010 21:35:45 +0200 [thread overview]
Message-ID: <837hrn86b2.fsf@gnu.org> (raw)
In-Reply-To: <4B4C28F6.9000209@swipnet.se>
> Date: Tue, 12 Jan 2010 08:47:02 +0100
> From: Jan Djärv <jan.h.d@swipnet.se>
> Cc: emacs-devel@gnu.org
>
> To assume that one can always beforehand descide if one is about to do a
> quickfix or not is also too simple minded.
You don't need to decide in advance. Start in the trunk or in
quickfix, and if you later see that a separate branch is required,
then
bzr branch trunk fix-something
cd fix-something
bzr merge ../trunk --uncommitted
cd ../trunk
bzr revert
cd ../fix-something
[and hack in the `fix-something' branch]
This copies uncommitted changes from trunk to a newly created branch,
then reverts the trunk to its previous pristine state, before you
started your not-so-simple fix.
next prev parent reply other threads:[~2010-01-12 19:35 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
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 [this message]
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=837hrn86b2.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jan.h.d@swipnet.se \
--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.