X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=771410ef1350443ee703f45434e86fd8ae2c6e74;hp=f93adefc49e830a09d8422df95673e42099ff1d2;hb=1d38a8e35e08d9a37393a809f8de4492759f4be3;hpb=a1a9073c083036f1c3fd024c3b96ecbccd6b424c diff --git a/git-debrebase b/git-debrebase index f93adefc..771410ef 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1264,6 +1264,7 @@ sub walk ($;$$$) { or $nomerge->("interchange merge-base ($ib)'s". " breakwater ($bbw)". " != breakwaters' merge-base ($bwb)"); + grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps or $nomerge->("interchange merge-base ($ib)'s". " anchor ($ibinfo->{SeriesBase})". @@ -1271,7 +1272,6 @@ sub walk ($;$$$) { (join ' ', map { $_->{Anchor} } @$ps). ")"); - $cl->{MergeInterchangeBaseInfo} = $ibinfo; $cl->{MergeBestAnchor} = $best_anchor; push @brw_cl, {