From: Tassilo Horn <tsdh@gnu.org>
To: emacs-devel@gnu.org
Subject: Bzr taskbranches and ChangeLog
Date: Fri, 20 Dec 2013 21:50:50 +0100 [thread overview]
Message-ID: <8761qjfdqt.fsf@thinkpad.tsdh.org> (raw)
Hi,
while reading http://www.emacswiki.org/emacs/BzrForEmacsDevs I don't get
exactly how to deal with ChangeLog entries when working with
taskbranches.
For example, I've just created a local branch bug-16090 which fixes that
bug. It's complete, but I want to wait with pushing until Stefan had a
look, so I'll surely need to merge from trunk some times.
With git I would commit my changes (no ChangeLog entries right now)
locally, then keep rebasing onto master until Stefan gives his go, then
write the ChangeLog entry, commit that too, squash that commit with the
code change commit, and then push one single commit with the code and
ChangeLog changes.
How do I do something similar with bzr?
When I get the emacswiki page right, I should write my ChangeLog entry
to some temporary file, and then commit locally providing the entries
(without author/date line) as commit message. Then I keep on merging
from an updated trunk until Stefan gives his go, and then I use the
commit message from the log to create a real ChangeLog entry. Finally,
I commit that and push.
Correct? But doesn't that lead to a log like
- ChangeLog commit
- Merge commit
- [...]
- Merge commit
- Original code commit
e.g., the eventual ChangeLog commit might be far off the original code
commit it is documenting?
Bye,
Tassilo
next reply other threads:[~2013-12-20 20:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 20:50 Tassilo Horn [this message]
2013-12-21 1:16 ` Bzr taskbranches and ChangeLog Xue Fuqiao
2013-12-21 7:34 ` Tassilo Horn
2013-12-21 7:50 ` Tassilo Horn
2013-12-21 8:35 ` Eli Zaretskii
2013-12-23 8:15 ` Tassilo Horn
2013-12-21 8:03 ` Tassilo Horn
2013-12-21 8:43 ` Eli Zaretskii
2013-12-21 8:03 ` Eli Zaretskii
2013-12-21 8:44 ` Tassilo Horn
2013-12-21 8:49 ` Jarek Czekalski
2013-12-21 9:25 ` Eli Zaretskii
2013-12-21 13:32 ` Tassilo Horn
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=8761qjfdqt.fsf@thinkpad.tsdh.org \
--to=tsdh@gnu.org \
--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.