* bzr: does a commit message get propagated from a branch?
@ 2011-10-27 21:33 Alan Mackenzie
2011-10-27 22:06 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Alan Mackenzie @ 2011-10-27 21:33 UTC (permalink / raw)
To: emacs-devel
Hi, Emacs.
I have a bazaar repository bound to savannah, S, just like everybody has.
From this repo I have made a branch, B, ...., and committed changes, with
commit message L in this branch.
I now want to merge my changes from B into S (and thence to savannah).
Do I have to do anything special for my message L to get to S? Or do I
just have to "bzr merge".
Or do I have to repeat the commit message L when merging back to S?
--
Alan Mackenzie (Nuremberg, Germany).
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: bzr: does a commit message get propagated from a branch?
2011-10-27 21:33 bzr: does a commit message get propagated from a branch? Alan Mackenzie
@ 2011-10-27 22:06 ` Eli Zaretskii
0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2011-10-27 22:06 UTC (permalink / raw)
To: Alan Mackenzie; +Cc: emacs-devel
> Date: Thu, 27 Oct 2011 21:33:59 +0000
> From: Alan Mackenzie <acm@muc.de>
>
> I have a bazaar repository bound to savannah, S, just like everybody has.
> >From this repo I have made a branch, B, ...., and committed changes, with
> commit message L in this branch.
>
> I now want to merge my changes from B into S (and thence to savannah).
> Do I have to do anything special for my message L to get to S? Or do I
> just have to "bzr merge".
>
> Or do I have to repeat the commit message L when merging back to S?
You merge from the branch B to the bound branch (a.k.a. trunk) S.
After that, you commit in S. When you commit in S, it is advisable to
provide a log message that summarizes whatever changes you did on B.
Not repeats the message L, summarizes it. That's because when people
issue the "bzr log" command after your commit to the trunk, they won't
see the detailed log messages from the branch, unless they use the -n0
switch to "bzr log". So providing a log message for the merge commit
will let them see a summary of what you did on the branch.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-27 22:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-27 21:33 bzr: does a commit message get propagated from a branch? Alan Mackenzie
2011-10-27 22:06 ` Eli Zaretskii
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).