diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 23:29:44 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
commit | b14d3f59c9aeb589033b7f712a2946e2d21e8b1a (patch) | |
tree | 536d1fa13cefbc0900429eca561cd2a1876471b3 /tests/tests | |
parent | 2045d087abc4445b98649af8eb4883c05573a324 (diff) |
git-debrebase: test suite: lib-gdr: break out some more t-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/gdr-diverge-nmu | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 9b37ca6..e647f80 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -56,24 +56,7 @@ t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched -: 'check that what we have is what is expected' -git checkout -b compare.nmu origin/master~0 -git checkout patch-queue/nmu . -git rm -rf debian/patches -git commit -m 'rm patches nmu' - -git checkout -b compare.maintainer origin/master~0 -git checkout did.maintainer . -git rm -rf --ignore-unmatch debian/patches -git commit --allow-empty -m 'rm patches maintainer' - -git merge compare.nmu -git diff --quiet master - -: 'check that dgit still likes it' - -git checkout master -t-dgit -wgf quilt-fixup +t-nmu-reconciled-good patch-queue/nmu t-ok |