Ah, I think I see the problem. lp:ubuntu/maverick/qtiplot was committed with no patches applied, whereas lp:debian/sid/qtiplot was committed with all patches applied.
I guess I should unapply the patches from the sid branch before attempting the merge
Ah, I think I see the problem. lp:ubuntu/maverick/qtiplot was committed with no patches applied, whereas lp:debian/sid/qtiplot was committed with all patches applied.
I guess I should unapply the patches from the sid branch before attempting the merge