From 404b824d7a46eee9fe76398fda6a44a7e9cf3681 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 09:58:05 +0100 Subject: git-debrebase: test suite: New gdr-merge test This still has a lot of xxx's, but as it is right now it passes, despite all the bugs. This seems like a reasonable baseline for more work. Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/tests') diff --git a/debian/tests/control b/debian/tests/control index e3274f2..1a4f510 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import 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-newupstream gdr-viagit +Tests: gdr-merge gdr-newupstream gdr-viagit Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime -- cgit v1.2.3