From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 19:24:20 +0000 (+0100)
Subject: git-debrebase: merge: Record the new-base in the wreckage.
X-Git-Tag: archive/debian/6.7~72
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e8ac0f9218a53a4dab9e2e1efe0ec696b6484011;ds=sidebyside

git-debrebase: merge: Record the new-base in the wreckage.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 18bc21f0..910e444d 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},