diff options
Diffstat (limited to 'tests/lib-gdr')
| -rw-r--r-- | tests/lib-gdr | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index fb58bf9..f633307 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -19,10 +19,12 @@ t-gdr-branch-structure () { # stitched # patches + local etype netype + case $state in laundered) etype=Upstream ;; stitched) etype=Pseudomerge ;; - patches) etype=XXX-TODO ;; + pushed) etype=AddPatches; netype=Pseudomerge ;; esac t-git-debrebase analyse >../anal.check @@ -52,6 +54,12 @@ t-gdr-branch-structure () { git diff --quiet $expect..$cid -- ':debian/patches' etype=Packaging ;; + AddPatches/SAME) + git diff --quiet $expect..$cid -- \ + ':.' ':!debian/patches' + etype=$netype + netype=Upstream + ;; Changelog/Packaging|\ Changelog/Upstream) git diff --quiet $expect..$cid -- \ |