{debupstream} no longer looks at non-base branches for debian/changelog
Bug #801618 reported by
Jelmer Vernooij
This bug affects 5 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builder |
Fix Released
|
Critical
|
Jelmer Vernooij |
Bug Description
With the recent changes to support {debupstream} per branch, {debupstream} now only looks at the base branch. This means that existing recipes will break if they rely on {debupstream} from a changelog file in a branch that is not the base branch.
This should at least be fixed for users of the older recipe formats. What should we do with the 0.4 format, should we require users to explicitly use {debupstream:
Related branches
lp://staging/~jelmer/bzr-builder/fix-debupstream
- James Westby: Approve
-
Diff: 224 lines (+78/-18)5 files modified__init__.py (+3/-1)
cmds.py (+9/-0)
recipe.py (+22/-8)
tests/test_blackbox.py (+1/-1)
tests/test_recipe.py (+43/-8)
Changed in bzr-builder: | |
status: | New → Triaged |
status: | Triaged → In Progress |
importance: | Undecided → Critical |
assignee: | nobody → Jelmer Vernooij (jelmer) |
summary: |
- {debupstream} no longer looks at other branches for debian/changelog + {debupstream} no longer looks at non-base branches for debian/changelog |
Changed in bzr-builder: | |
milestone: | none → 0.7.1 |
status: | In Progress → Fix Released |
To post a comment you must log in.
On Fri, 24 Jun 2011 15:32:34 -0000, Jelmer Vernooij <email address hidden> wrote: branch} if they want the version to come
> What should we do with the 0.4 format, should we require users to
> explicitly use {debupstream:
> from a non-base branch?
I'm not sure. I don't think that the existing behaviour is bad.
It does mean that the user can't take from the base branch though, as it
has no name that can be used.
I think for consistency we just have the behaviour currently in trunk
(take from the base branch.)
That seems less than ideal though, as generally there will be only one
tree that has the changelog, so the currentl behaviour is easiest for
people to use.
Thanks,
James