Merge lp:~mir-team/mir/0.26-old into lp:mir/ubuntu

Proposed by Alan Griffiths
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~mir-team/mir/0.26-old
Merge into: lp:mir/ubuntu
Diff against target: 13 lines (+6/-0)
1 file modified
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~mir-team/mir/0.26-old
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
Review via email: mp+324846@code.launchpad.net

Commit message

No change MP to SRU 0.26.3 into Zesty and Yakkety

To post a comment you must log in.
lp:~mir-team/mir/0.26-old updated
4070. By Alan Griffiths

Correct email address

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Again, it's at this stage you might want to start maintaining separate distro branches. Even if all are fed by the same lp:mir/0.26

Ideally one distro should not see another distro in its changelog unless that other one was a predecessor. They should not be interleaved.

Revision history for this message
Michał Sawicz (saviq) wrote :

I'm going to clean this situation up, I hope.

review: Disapprove

Unmerged revisions

4070. By Alan Griffiths

Correct email address

4069. By Alan Griffiths

Update changelog for zesty & yakkety

4068. By Daniel van Vugt

Merge final 0.26.3 changelog back from distro.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-05-26 16:57:20 +0000
3+++ debian/changelog 2017-05-31 08:46:35 +0000
4@@ -1,3 +1,9 @@
5+mir (0.26.3+17.10.20170526.3-0ubuntu2) UNRELEASED; urgency=medium
7+ * SRU to Zesty & Yakkety
9+ -- Alan Griffiths <alan.griffiths@canonical.com> Wed, 31 May 2017 09:33:28 +0100
11 mir (0.26.3+17.10.20170526.3-0ubuntu1) artful; urgency=medium
13 [ Daniel van Vugt ]


People subscribed via source and target branches

to all changes: