From 99068bbe18c8fe83714639cc4ba9adcab5d71e59 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 11:51:04 +0100 Subject: [PATCH] git-debrebase: merge: Check that merge resolution is correct Signed-off-by: Ian Jackson --- git-debrebase | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index 2b257dd6..3d8d6f33 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 { -- 2.30.2