diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index d6d33f7..aeb7725 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -22,10 +22,13 @@ t-gdr-good () { git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches' - local etype netype + local etype netype bwtip case $state in - laundered) etype=Upstream ;; + laundered) + etype=Upstream + bwtip=Y:`t-git-debrebase breakwater` + ;; stitched) etype=Pseudomerge ;; pushed) etype=AddPatches; netype=Pseudomerge ;; esac @@ -43,6 +46,7 @@ t-gdr-good () { expect="$parents" enparents=1 : "$ctype/$cetype" "$parents" + case "$ctype/$cetype" in Pseudomerge/SAME) ;; Packaging/SAME) ;; @@ -58,6 +62,15 @@ t-gdr-good () { ;; esac + case "$ctype/$etype" in + Packaging/Upstream|\ + Changelog/Upstream) + if [ "x$bwtip" != x ]; then + test "$bwtip" = "Y:$cid" + bwtip='' + fi + esac + case "$ctype" in Pseudomerge) expect=${info#Contributor=} |