git-debrebase: merge: Add another xxx comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index c8ee5e549b2acafc0794db85561dd7c66c40583f..6d51a90ba7c1cd50c7d6d3062a823acb76d24732 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -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>) {