chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: merge: Pass wreckage hashref to merge_series
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 2a2d1ed2c81e0a83f987ccdeb8e2c6d2d426254b..830cfd5ea978586b68a6e995936bcf68e9dac7f7 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-362,8
+362,8
@@
sub gbp_pq_export ($$$) {
# our own patch identification algorithm?
# this is an alternative strategy
# our own patch identification algorithm?
# this is an alternative strategy
-sub merge_series ($$;@) {
- my ($newbase, $base_q, @input_qs) = @_;
+sub merge_series ($$
$
;@) {
+ my ($newbase, $
wrecknotes, $
base_q, @input_qs) = @_;
# $base_q{SeriesBase} $input_qs[]{SeriesBase}
# $base_q{SeriesTip} $input_qs[]{SeriesTip}
# ^ specifies several patch series (currently we only support exactly 2)
# $base_q{SeriesBase} $input_qs[]{SeriesBase}
# $base_q{SeriesTip} $input_qs[]{SeriesTip}
# ^ specifies several patch series (currently we only support exactly 2)
@@
-1392,7
+1392,7
@@
sub walk ($;$$$) {
} elsif ($method eq 'MergeMergeSeries') {
print "Running merge resolution for $cl->{CommitId}...\n";
$build = merge_series
} elsif ($method eq 'MergeMergeSeries') {
print "Running merge resolution for $cl->{CommitId}...\n";
$build = merge_series
- $build,
+ $build,
$cl->{MergeWreckNotes},
$cl->{MergeInterchangeBaseInfo},
@{ $cl->{Parents} };
$last_anchor = $cl->{MergeBestAnchor};
$cl->{MergeInterchangeBaseInfo},
@{ $cl->{Parents} };
$last_anchor = $cl->{MergeBestAnchor};