Hi there. What's the appropriate format for a ChangeLog entry when closing out a issue, or when merging in a change from another branch?
My best guess was:
2010-07-12 Michael Hope michael.hope@linaro.org
lp:602171 * gcc.target/i386/pr9771-1.c: Merge r159776 from FSF GCC into the Linaro branch. * gcc.target/arm/frame-pointer-1.c: Likewise.
Original entry: 2010-05-24 Paul Brook paul@codesourcery.com
* gengtype-lex.l: Add HARD_REG_SET. * expr.c (expand_expr_real_1): Record writes to hard registers. * function.c (rtl_data): Add asm_clobbers. * ira.c (compute_regs_asm_clobbered): Use crtl->asm_clobbers. (ira_setup_eliminable_regset): Remove regs_asm_clobbered. Use crtl->asm_clobbers.
Note that the change was already present but the test cases hadn't been updated.
In this case I back-ported Subversion revision 159776 from the FSF GCC into the Linaro branch to fix a Launchpad ticket that was assigned against me. Paul Brook did the original work. The note at the bottom is due to most of the fix already existing in the Linaro branch.
-- Michael
On Mon, Jul 12, 2010, Michael Hope wrote:
Hi there. What's the appropriate format for a ChangeLog entry when closing out a issue, or when merging in a change from another branch?
My best guess was:
2010-07-12 Michael Hope michael.hope@linaro.org
lp:602171
For the Launchpad bugs part, I recommend noting this "LP: #1234" when the bug is being closed with this change and using "bzr --fixes lp:1234 commit". Use "LP #1234" when just referring to a related bug (which is not being closed by this change) -- note: no colon.
I'll let others comment on the specifics of the ChangeLog entry you provided (it seemed ok to me); all I know is that it's GNU ChangeLog style, and that there's a vim syntax plugin for it (and I would guess emacs) :-)
linaro-toolchain@lists.linaro.org
-
Loïc Minier -
Michael Hope