diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 13:31:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:36:23 +0100 |
commit | 0d821f5b266626e266c59522017f6d9e714d89c3 (patch) | |
tree | f793fb1be1563503548fe5416a093fa867c8372a | |
parent | cb5a33d8508c3b83a2bb776e567d8cd2d1a6e50d (diff) |
git-debrebase: merge: Add another xxx comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index c8ee5e5..6d51a90 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>) { |