Daily build can't overwrite upstream "debian" directory
Bug #760201 reported by
Darxus
This bug affects 7 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Triaged
|
Low
|
Unassigned | ||
Bug Description
I'm trying to create a daily build of spamassassin.
Upstream svn trunk contains an ancient debian directory. I'm attempting to overwrite it with:
nest-part packaging lp:ubuntu/spamassassin debian debian
The build fails with:
Conflict adding file debian. Moved existing file to debian.moved.
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
https:/
https:/
I'd like a way to get it to not fail as a result of moving an old duplicate directory out of the way.
| Changed in launchpad: | |
| status: | New → Triaged |
| importance: | Undecided → Low |
| tags: | added: branches recipe |
Revision history for this message
| Curtis Hovey (sinzui) wrote | #1 |
Revision history for this message
| Darxus (darxus) wrote | #2 |
Revision history for this message
| Darxus (darxus) wrote | #3 |
Revision history for this message
| Timmie (timmie) wrote | #4 |
To post a comment you must log in.
This is a very annoying bug. The work around is to merge a branch that removes the problematic directory:
bzr branch lp:spamassassin spamassassin-
cd spamassassin
bzr rm debian
bzr ci -m "Remove conflicting packaging rules."
bzr push lp:~<launchpad-
Then use the branch in the recipe:
lp:spamassassin
merge unpackaging lp:~<launchpad-
nest-part packaging lp:ubuntu/spamassassin debian debian