Daily build can't overwrite upstream "debian" directory

Bug #760201 reported by Darxus
36
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://launchpadlibrarian.net/69302542/buildlog.txt.gz
https://code.launchpad.net/~darxus/+recipe/spamassassin-daily

I'd like a way to get it to not fail as a result of moving an old duplicate directory out of the way.

Curtis Hovey (sinzui)
Changed in launchpad:
status: New → Triaged
importance: Undecided → Low
tags: added: branches recipe
Revision history for this message
Curtis Hovey (sinzui) wrote :

This is a very annoying bug. The work around is to merge a branch that removes the problematic directory:

bzr branch lp:spamassassin spamassassin-unpackaging
cd spamassassin
bzr rm debian
bzr ci -m "Remove conflicting packaging rules."
bzr push lp:~<launchpad-id>/+junk/spamassassin-unpackaging

Then use the branch in the recipe:
lp:spamassassin
merge unpackaging lp:~<launchpad-id>/+junk/spamassassin-unpackaging
nest-part packaging lp:ubuntu/spamassassin debian debian

Revision history for this message
Darxus (darxus) wrote :

How do I create a branch that removes a directory?

Revision history for this message
Darxus (darxus) wrote :

Sorry, didn't realize you were telling me exactly what I just asked.

Revision history for this message
Timmie (timmie) wrote :

Hello,
I agree with the original reporter:

a remove or replace command for the recipies would be helpful.

I would actually save file space because I would be ebale to do these tasks without the second spamassassin-unpackaging repo.

Thanks in advance.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.