Build problem after `bzr merge`ing source packages
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu Distributed Development |
Confirmed
|
Undecided
|
Unassigned | ||
brz-debian |
Triaged
|
Medium
|
Unassigned | ||
bzr-builddeb |
Triaged
|
Medium
|
Unassigned |
Bug Description
$ bzr init-repo sphinx
$ cd sphinx
$ bzr branch ubuntu:sphinx precise
$ bzr branch debianlp:sid/sphinx sid
$ cd precise
$ bzr merge ../sid
This will result in conflicts for debian/control and debian/rules. Resolve them in favor of using dh_python2, although I think the details of the resolution aren't important for the purposes of this bug. Then...
$ bzr bd -S
Building using working tree
Building package in normal mode
Looking for a way to retrieve the upstream tarball
Upstream tarball already exists in build directory, using that
bzr: ERROR: [Errno 2] No such file or directory: '/home/
Look carefully at the bzr stat output and you'll see that the .pc directory got removed. Reverting the changes to .pc doesn't help as they will show up as local changes. I'll try to use the new quilt merge options to see if I can get something to work.
Changed in bzr-builddeb: | |
assignee: | Jelmer Vernooij (jelmer) → nobody |
Changed in brz-debian: | |
status: | New → Triaged |
importance: | Undecided → Medium |
Nope, as far as I can tell, neither of the debian/ bzr-builddeb. conf options help avoid the problem.
I'm going to go ahead and syncpackage sphinx to unblock us, but you should be able to grab the earlier revision to test things out.