ignores upstream branch if version can't be found
Bug #772424 reported by
Jelmer Vernooij
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Fix Released
|
High
|
Jelmer Vernooij |
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 UpstreamBranchS
Related branches
lp:~jelmer/bzr-builddeb/merge-upstream-branch-revision
- James Westby: Approve
-
Diff: 180 lines (+68/-11)7 files modifiedcmds.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)
Changed in bzr-builddeb: | |
status: | In Progress → Fix Committed |
milestone: | none → 2.8 |
Changed in bzr-builddeb: | |
milestone: | 2.8 → 2.7.4 |
status: | Fix Committed → Fix Released |
To post a comment you must log in.