+git branch other-before-new-upstream
+
+t-git-debrebase new-upstream 2.1
+t-git-next-date
+
+: ----- prepare master -----
+
+git checkout master
+t-git-debrebase new-upstream 2.1
+t-git-next-date
+
+git branch master-before-merge
+
+: ----- make the merge -----
+
+git merge -s ours other
+
+# we have to do a little dance to make this not a pseudomerge
+t-git-next-date
+dch -a 'Merge, only conflict was in debian/changelog'
+t-dch-r-rune dch
+git commit -a --amend --no-edit
+
+junkref=refs/debrebase-wreckage/junk
+git update-ref $junkref v2.1
+
+t-expect-fail F:'divergent anchors' \
+t-git-debrebase
+
+git rev-parse $junkref
+
+t-expect-fail F:'divergent anchors' \
+t-git-debrebase --save-wreckage
+
+test '' = "$(t-git-get-ref-exact $junkref)"
+
+git for-each-ref refs/debrebase-wreckage | egrep .
+
+: ===== late failure in apply =====
+