return $unknown->("complex merge");
}
-sub walk ($$$;$$$) {
- my ($input, $pseudos_must_overwrite_this, $wantdebonly,
+sub walk ($$;$$$) {
+ my ($input, $wantdebonly,
$report, $depth, $report_anomaly, $report_only) = @_;
# go through commits backwards
# we generate two lists of commits to apply
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
- if (defined $pseudos_must_overwrite_this &&
- !grep {
- is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
- },
- @{ $cl->{Overwritten} }) {
- $report_anomaly->($cl,
- "Pseudomerge should overwrite".
- " $pseudos_must_overwrite_this".
- " but does not do so");
- }
push @pseudomerges, $cl;
$rewrite_from_here->();
$cur = $ty->{Contributor};