diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 15:01:03 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 4dea77665732625beb1e7b8be5f459dd3b4c7fd7 (patch) | |
| tree | 4bf966f473c8ea1d05c202ebf0ee92a7c256c999 /tests | |
| parent | 0df7ace43a2137e76134210d58f02c07a0c59323 (diff) | |
git-debrebase: test suite: gdr-edits: check branch structure after last push
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 10 | ||||
| -rwxr-xr-x | tests/tests/gdr-edits | 2 |
2 files changed, 11 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 -- \ diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 5388f04..30786fe 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -45,6 +45,8 @@ t-gdr-branch-structure stitched t-dgit push-source +t-gdr-branch-structure pushed + : todo 'more tests: convert dgit import new upstream version' : todo 'more tests: convert dgit import same upstream version' : todo 'more tests: other maint updated, we must fetch' |