Bazaar

Merge lp:~ian-clatworthy/bzr/news-template-524184 into lp:bzr/2.0

  1. news-template-524184
  2. Merge into 2.0
Proposed by Ian Clatworthy
Status: Merged
Approved by: Ian Clatworthy
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~ian-clatworthy/bzr/news-template-524184
Merge into: lp:bzr/2.0
Diff against target: 87 lines (+34/-32)
2 files modified
NEWS (+3/-32)
NEWS-template.txt (+31/-0)
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/news-template-524184
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+19683@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

This fixes CHM generation by moving the NEWS section template into a separate file. Not having this crud at the end of the HTML Release Notes is nicer too.

I'm proposing this for 2.0 because it affects chm generation on all 2.x versions and it's a low risk change.

Revision history for this message
Martin Pool (mbp) wrote :

Yes please, but while you're there can you move the "not released yet" out of the heading and into the place the date would go, for the same reason: it makes the headings and hyperlinks unwieldy.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-02-18 05:38:14 +0000
3+++ NEWS 2010-02-19 05:37:15 +0000
4@@ -20,6 +20,9 @@
5 * Handle renames correctly when there are files or directories that
6 differ only in case. (Chris Jones, Martin Pool, #368931)
7
8+* Fixed CHM generation by moving the NEWS section template into
9+ a separate file. (Ian Clatworthy, #524184)
10+
11 * If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
12 error, report that error rather than failing with an unhelpful
13 ``UnboundLocalError``.
14@@ -10871,37 +10874,5 @@
15 diff, status, etc.
16
17
18-bzr ?.?.? (not released yet)
19-############################
20-
21-:Codename: template
22-:2.0.2: ???
23-
24-Compatibility Breaks
25-********************
26-
27-New Features
28-************
29-
30-Bug Fixes
31-*********
32-
33-Improvements
34-************
35-
36-Documentation
37-*************
38-
39-API Changes
40-***********
41-
42-Internals
43-*********
44-
45-Testing
46-*******
47-
48-
49-
50 ..
51 vim: tw=74 ft=rst ff=unix
52
53=== added file 'NEWS-template.txt'
54--- NEWS-template.txt 1970-01-01 00:00:00 +0000
55+++ NEWS-template.txt 2010-02-19 05:37:15 +0000
56@@ -0,0 +1,31 @@
57+bzr ?.?.? (not released yet)
58+############################
59+
60+:Codename: template
61+:2.0.2: ???
62+
63+Compatibility Breaks
64+********************
65+
66+New Features
67+************
68+
69+Bug Fixes
70+*********
71+
72+Improvements
73+************
74+
75+Documentation
76+*************
77+
78+API Changes
79+***********
80+
81+Internals
82+*********
83+
84+Testing
85+*******
86+
87+

Subscribers

People subscribed via source and target branches