Merge lp://qastaging/~wgrant/bzr-builder/bug-1350430 into lp://qastaging/bzr-builder
Proposed by
William Grant
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 173 | ||||
| Proposed branch: | lp://qastaging/~wgrant/bzr-builder/bug-1350430 | ||||
| Merge into: | lp://qastaging/bzr-builder | ||||
| Diff against target: |
55 lines (+8/-6) 2 files modified
deb_version.py (+3/-3) tests/test_blackbox.py (+5/-3) |
||||
| To merge this branch: | bzr merge lp://qastaging/~wgrant/bzr-builder/bug-1350430 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
| bzr-builder developers | Pending | ||
|
Review via email:
|
|||
Commit message
debversion and debupstream-base were used extensively in format 0.3 recipes, so revert the change in 0.7.3 that forbade them before 0.4.
Description of the change
debversion and debupstream-base were used extensively in format 0.3 recipes on Launchpad, so revert the change in 0.7.3 that forbade them before 0.4. There were also a few uses of debupstream-base in 0.2, but probably not enough to worry about.
I also fixed test_blackbox to pass on utopic.
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) wrote | # |
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
On Wed, Aug 06, 2014 at 10:30:35AM -0000, William Grant wrote:
> William Grant has proposed merging lp:~wgrant/bzr-builder/bug-1350430 into lp:bzr-builder.
>
> Commit message:
> debversion and debupstream-base were used extensively in format 0.3 recipes, so revert the change in 0.7.3 that forbade them before 0.4.
>
> Requested reviews:
> bzr-builder developers (bzr-builder-devs)
> Related bugs:
> Bug #1350430 in bzr-builder: "{debupstream} {debversion} not recognised by format 0.4"
> https:/
>
> For more details, see:
> https:/
>
> debversion and debupstream-base were used extensively in format 0.3 recipes on Launchpad, so revert the change in 0.7.3 that forbade them before 0.4. There were also a few uses of debupstream-base in 0.2, but probably not enough to worry about.
>
> I also fixed test_blackbox to pass on utopic.
Looks good to me, but I'm pretty sure I don't have any sort of official
powers to approve this. :)
Jelmer