Comment 11 for bug 760735

When this happened to me i suspect it was because diff was creating a new file that didn't exist yet on the source. "I suspect" because when i tried to create the file on the merged repo i got a bzr merge conflict. Now i tried the tar ignore .pc option in debian/options and will know if that works tomorrow