git-debrebase: merge: Check that merge resolution is correct

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

1 files changed, 10 insertions, 1 deletions

diff --git a/git-debrebase b/git-debrebase
index 2b257dd..3d8d6f3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1296,7 +1296,16 @@ sub walk ($;$$$) {
 		    $cl->{MergeInterchangeBaseInfo},
 		    @{ $cl->{Parents} };
 		$last_anchor = $cl->{MergeBestAnchor};
-		# xxx need to check the tree somehow
+		my $check_differs = get_differs $build, $cl->{CommitId};
+		# Breakwater changes which were in each side of the
+		# merge should be in MergeCreateMergedBreakwaters
+		# output.  Upstream changes are exactly the result
+		# of merge_series.  So the only difference should
+		# be potential laundry results.
+		$nomerge->(sprintf
+                    "merge misresolved: tree is not the same (%s %s d.%#x)",
+			   $cl->{CommitId}, $build, $check_differs)
+		    if $check_differs & ~D_PAT_ADD;
 		print "Merge resolution successful.\n";
 		next;
 	    } else {