chiark / gitweb /
git-debrebase: merge: Add another xxx comment
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 12:31:16 +0000 (13:31 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000 (15:36 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index c8ee5e5..6d51a90 100755 (executable)
@@ -395,6 +395,8 @@ sub merge_series ($$;@) {
        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>) {