From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 12:31:16 +0000 (+0100)
Subject: git-debrebase: merge: Add another xxx comment
X-Git-Tag: archive/debian/6.7~124
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d821f5b266626e266c59522017f6d9e714d89c3;p=dgit.git

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 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>) {