{ local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
failedcmd @gbp_cmd;
}
- runcmd @git, qw(add -f debian/patches);
+ runcmd @git, qw(add -f debian/patches) if stat_exists 'debian/patches';
}
my $result;
+ my $mwrecknote = sub {
+ my ($reftail, $commitish) = @_;
+ $wrecknotes->{$reftail} = $commitish;
+ };
+
local $workarea = fresh_playground "$playprefix/merge";
my $seriesfile = "debian/patches/series";
in_workarea sub {
printdebug "pec' $pec\n";
runcmd @git, qw(reset -q --hard), $pec;
$q->{MR}{PEC} = $pec;
+ $mwrecknote->("$q->{LeftRight}-patchqueue");
}
# now, because of reverse, we are on $input_q->{MR}{OQC}
runcmd @git, qw(checkout -q -b merge);
}
runcmd @git, qw(add), $seriesfile;
- runcmd @git, qw(commit --quiet -m), 'Merged series';
+ runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
+ $mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
printdebug "merge_series series gbp pq import\n";
runcmd qw(gbp pq import);
$build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
}
$result = $build;
+ $mwrecknote->('merged-result', $result);
+
runcmd @git, qw(update-ref refs/heads/result), $result;
runcmd @git, qw(checkout -q -b debug);
runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
runcmd @git, qw(add .);
runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
- printdebug sprintf "merge_series done debug=%s\n",
- git_rev_parse 'HEAD';
+ my $mdebug = git_rev_parse 'HEAD';
+ printdebug sprintf "merge_series done debug=%s\n", $mdebug;
+ $mwrecknote->('merged-debug', $mdebug);
};
printdebug "merge_series returns $result\n";
return $result;
my $ibinfo = { SeriesTip => $btip,
SeriesBase => $bbw,
- Anchor => $banchor };
+ Anchor => $banchor,
+ LeftRight => 'mergebase' };
+
$bbw eq $bwb
or $nomerge->("interchange merge-base ($ib)'s".
" breakwater ($bbw)".