# refs/ffqrebase-prev/BRANCH BRANCH may be refs/...; if not it means
# refs/ffqrebase-base/BRANCH refs/heads/BRANCH
# zero, one, or both of these may exist
+s
+# git-debrebase without start, if already started, is willing
+# to strip pseudomerges provided that they overwrite (xxx exactly ???)
+# the previous HEAD
use strict;
sub walk ($$$;$$$) {
my ($input, $pseudos_must_overwrite_this, $wantdebonly,
- $report, $depth, $report_anomaly, $nogenerate) = @_;
+ $report, $depth, $report_anomaly, $report_only) = @_;
# go through commits backwards
# we generate two lists of commits to apply
# => ($tip, $breakwater_tip)
my $st = $cl->{SubType};
$report->($cl);
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
+ push @processed, $cl;
my $p0 = $cl->{Parents}[0]{CommitId};
if ($ty eq 'AddPatches') {
$cur = $p0;
next;
} elsif ($ty eq 'Packaging') {
push @deb_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Upstream') {
push @ups_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Mixed') {
workarea_fresh();
- my $rewriting = 1;
+ my $rewriting = 0;
my $build = $basis;