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 /debian | |
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 'debian')
-rw-r--r-- | debian/tests/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/tests/control b/debian/tests/control index f8957a0..a2c73df 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -20,11 +20,11 @@ Tests: gdr-merge-conflicts Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-subcommands gdr-unprocessable gdr-unprocessable-hints +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime -Tests: gdr-merge gdr-newupstream gdr-viagit +Tests: gdr-newupstream gdr-viagit Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime |