runcmd @git, qw(checkout -q -b merge);
printdebug "merge_series merging...\n";
my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
runcmd @git, qw(checkout -q -b merge);
printdebug "merge_series merging...\n";
my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
printdebug "merge_series merge ok, series...\n";
# We need to construct a new series file
printdebug "merge_series merge ok, series...\n";
# We need to construct a new series file
$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
printdebug "merge_series series gbp pq import\n";
$mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
printdebug "merge_series series gbp pq import\n";
# OK now we are on patch-queue/merge, and we need to rebase
# onto the intended parent and drop the patches from each one
# OK now we are on patch-queue/merge, and we need to rebase
# onto the intended parent and drop the patches from each one
my ($btip, $bbw, $banchor) = eval {
walk $ib, 0, $report, $report_lprefix.' ';
};
my ($btip, $bbw, $banchor) = eval {
walk $ib, 0, $report, $report_lprefix.' ';
};
$mwrecknote->("mergebase-laundered", $btip);
$mwrecknote->("mergebase-breakwater", $bbw);
$mwrecknote->("mergebase-laundered", $btip);
$mwrecknote->("mergebase-breakwater", $bbw);