diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:24:20 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:24:20 +0100 |
| commit | e8ac0f9218a53a4dab9e2e1efe0ec696b6484011 (patch) | |
| tree | 339e193d53d819ab0aff9ed41717f17b040c8c6d | |
| parent | 52d1506110771ee16b19be4c6b82e06559c9e6f5 (diff) | |
git-debrebase: merge: Record the new-base in the wreckage.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 18bc21f..910e444 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1470,6 +1470,7 @@ sub walk ($;$$$) { @parents = map { $_->{Breakwater} } @{ $cl->{Parents} }; } elsif ($method eq 'MergeMergeSeries') { print "Running merge resolution for $cl->{CommitId}...\n"; + $mwrecknote->('new-base', $build); $build = merge_series $build, $cl->{MergeWreckNotes}, $cl->{MergeInterchangeBaseInfo}, |