Packaging and upstream branches usually have no common history and can't always be combined in recipes
Bug #627119 reported by
Andrew Hunter
This bug affects 3 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Ubuntu Distributed Development |
Triaged
|
High
|
Unassigned | ||
Bug Description
If one wishes to use recipes to build source packages, one encounters situations where it is not possible to merge two branches.
For example
lp:upstream branch
merge packaging lp:packaging
results in a 'no last common ancestor' error as neither branches have any shared history.
The current workaround is to use the 'nest' and 'run' command and move the required files (the debian dir in this case) into the branch, then remove unnecessary files.
However, the run command is not supported on launchpad.
Revision history for this message
| Andrew Bennetts (spiv) wrote | #1 |
Revision history for this message
| James Westby (james-w) wrote | #3 |
| affects: | launchpad-code → null |
| Changed in udd: | |
| status: | New → Triaged |
| importance: | Undecided → High |
| summary: |
- Can not merge branches that have no common ancestor + Packaging and upstream branches usually have no common history and can't + always be combined in recipes |
| no longer affects: | null |
To post a comment you must log in.
The latest bzr-builder release should support this via the new nest-part instruction (the fix for bug 479705), but Launchpad isn't using that version of bzr-builder yet. I've added Soyuz (which I think is the relevant Launchpad component to this bug).