bzr-builddeb

ignores upstream branch if version can't be found

Bug #772424 reported by Jelmer Vernooij
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb
Fix Released
High
Jelmer Vernooij
bzr-builddeb 2.7.4

Bug Description

merge-upstream currently ignores the upstream branch when it tries to merge and it can't find a revision that matches the new upstream version.

This happens because UpstreamBranchSource.version_as_revision() simply returns None (rather than raising PackageVersionNotPresent as the other backends do) when a version is missing.

Related branches

lp:~jelmer/bzr-builddeb/merge-upstream-branch-revision
James Westby: Approve
Diff: 180 lines (+68/-11)
7 files modified
cmds.py (+10/-2)
debian/changelog (+7/-0)
merge_upstream.py (+2/-2)
tests/blackbox/test_merge_upstream.py (+19/-3)
tests/test_upstream.py (+18/-0)
upstream/__init__.py (+2/-0)
upstream/branch.py (+10/-4)
lp:ubuntu/oneiric/bzr-builddeb
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: In Progress → Fix Committed
milestone: none → 2.8
Max Bowsher (maxb)
Changed in bzr-builddeb:
milestone: 2.8 → 2.7.4
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.