Merge lp://staging/~nmb/bzr/news-details into lp://staging/bzr

Proposed by Neil Martinsen-Burrell
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~nmb/bzr/news-details
Merge into: lp://staging/bzr
Diff against target: 20 lines (+4/-1)
1 file modified
doc/developers/HACKING.txt (+4/-1)
To merge this branch: bzr merge lp://staging/~nmb/bzr/news-details
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+17825@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

HACKING.txt should specify a sort order for NEWS entries if we want to have one.

Revision history for this message
Robert Collins (lifeless) wrote :

 review: +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt 2009-12-29 14:29:08 +0000
+++ doc/developers/HACKING.txt 2010-01-21 22:49:12 +0000
@@ -1147,13 +1147,16 @@
1147 * new features - should be brought to their attention1147 * new features - should be brought to their attention
1148 * bug fixes - may be of interest if the bug was affecting them, and1148 * bug fixes - may be of interest if the bug was affecting them, and
1149 should include the bug number if any1149 should include the bug number if any
1150 * major documentation changes1150 * major documentation changes, including fixed documentation bugs
1151 * changes to internal interfaces1151 * changes to internal interfaces
11521152
1153People who made significant contributions to each change are listed in1153People who made significant contributions to each change are listed in
1154parenthesis. This can include reporting bugs (particularly with good1154parenthesis. This can include reporting bugs (particularly with good
1155details or reproduction recipes), submitting patches, etc.1155details or reproduction recipes), submitting patches, etc.
11561156
1157To help with merging, NEWS entries should be sorted lexicographically
1158within each section.
1159
1157Commands1160Commands
1158--------1161--------
11591162