"bzr merge-upstream" does not work properly if there is already a debian folder in branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Triaged
|
Low
|
Unassigned |
Bug Description
I'm starting a new branch from scratch for building packages with bzr-builddeb. I've started populating my debian folder with maintainer scripts from an older git branch, before merging the upstream sources.
When I run "bzr merge-upstream" in this branch, the command seems to succeed, but the source files are not copied to my branch. If I try to run "bar merge-upstream" again, it returns an error message saying the upstream sources are already merged, but the source files are not present in the branch.
On the other hand, if I merge the upstream sources in an empty branch before populating the debian folder, "bzr merge-upstream" works as expected.
I'm using the bzr-builddeb version included in Precise.
Changed in bzr-builddeb: | |
status: | New → Triaged |
importance: | Undecided → Low |