Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
foreach my $q ($base_q, reverse @input_qs) {
my $s = $q->{MR}{S};
gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
foreach my $q ($base_q, reverse @input_qs) {
my $s = $q->{MR}{S};
gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
+ # xxx avoid trying to merge debian/ again here, by
+ # always using debian/ from newbase
if (open S, $seriesfile) {
my @earlier;
while (my $patch = <S>) {
if (open S, $seriesfile) {
my @earlier;
while (my $patch = <S>) {