From 0d821f5b266626e266c59522017f6d9e714d89c3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 13:31:16 +0100
Subject: [PATCH] git-debrebase: merge: Add another xxx comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-debrebase b/git-debrebase
index c8ee5e54..6d51a90b 100755
--- 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>) {
-- 
2.30.2