default build type in empty branch should be normal, not merge
Bug #776528 reported by
Jelmer Vernooij
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-builddeb |
Fix Released
|
Medium
|
Jelmer Vernooij | ||
Bug Description
As reported in one of the comments in bug 772225:
With the latest changes in trunk the errors have gone away, but the command still doesn't work correctly (at least not as I would expect):
$ bzr init hello && cd hello
$ bzr merge-upstream ../hello-2.7.tar.gz --package hello --version 2.7 --distribution natty
Using version string 2.7.
An entry for the new upstream version has been added to the changelog.
$ bzr st
added:
debian/
unknown:
debian/changelog
$ ls
debian
The tarball contents aren't included in the branch
Related branches
lp://staging/~jelmer/bzr-builddeb/first-release
- James Westby: Approve
-
Diff: 171 lines (+61/-15)7 files modifiedcmds.py (+5/-4)
debian/changelog (+7/-0)
merge_upstream.py (+6/-2)
tests/blackbox/test_merge_upstream.py (+8/-0)
tests/test_merge_upstream.py (+23/-3)
tests/test_util.py (+7/-0)
util.py (+5/-6)
| Changed in bzr-builddeb: | |
| status: | Triaged → In Progress |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| milestone: | none → 2.7.6 |
| Changed in bzr-builddeb: | |
| milestone: | 2.7.6 → none |
| Changed in bzr-builddeb: | |
| status: | In Progress → Fix Committed |
| milestone: | none → 2.7.6 |
| milestone: | 2.7.6 → none |
| milestone: | none → 2.8 |
| Changed in bzr-builddeb: | |
| status: | Fix Committed → Fix Released |
| milestone: | 2.8 → 2.7.7 |
To post a comment you must log in.
