X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=565e0b167ad1c104cd026e92c9637eda368c0775;hp=de365a2465e2a115553939f0d5b43f433eaa3c13;hb=7faed22010cacb9bd7cc029b860840947e03bf8a;hpb=4f22209a590da904276c3a52643473f44cc22d18 diff --git a/tests/lib-gdr b/tests/lib-gdr index de365a24..565e0b16 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -55,8 +55,8 @@ t-gdr-good () { Changelog/Packaging) ;; Changelog/Upstream) ;; Upstream/SAME) ;; - BreakwaterUpstreamMerge/Upstream) ;; - BreakwaterUpstreamMerge/Packaging) ;; + Anchor/Upstream) ;; + Anchor/Packaging) ;; *) fail "etype=$etype ctype=$ctype cetype=$cetype $cid" ;; @@ -98,7 +98,7 @@ t-gdr-good () { Upstream/SAME) git diff --quiet $expect..$cid -- ':debian' ;; - BreakwaterUpstreamMerge) + Anchor) break ;; esac