diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 12:32:54 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 12:55:17 +0100 |
| commit | 1f8626d4eaf79e8f26f0e27ff076fd5469a7cbe4 (patch) | |
| tree | 59b6d83e50fd431b289cb65c8b91ad7998d18cea /tests | |
| parent | 7b33413197c2f4fc5c9718f6c4fd4724c5838888 (diff) | |
test suite: Test dgit branch_is_gdr walker on a merge resolution
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-merge | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index d2df2b8..78b79e9 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -3,7 +3,7 @@ set -e autoimport= . tests/lib -t-dependencies NO-DGIT GDR +t-dependencies GDR t-tstunt-parsechangelog t-setup-import gdr-convert-gbp-noarchive @@ -59,4 +59,7 @@ t-some-changes after t-git-debrebase t-gdr-good laundered +t-dgit quilt-fixup +t-gdr-made-patches + t-ok |