From b14d3f59c9aeb589033b7f712a2946e2d21e8b1a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 23:29:44 +0000 Subject: git-debrebase: test suite: lib-gdr: break out some more t-* Signed-off-by: Ian Jackson --- tests/lib-gdr | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'tests/lib-gdr') diff --git a/tests/lib-gdr b/tests/lib-gdr index d45759d..da119bc 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -202,3 +202,27 @@ t-maintainer-commit-some-changes () { t-git-next-date } + +t-nmu-reconciled-good () { + local nmutree=$1 + + : 'check that what we have is what is expected' + + git checkout -b compare.nmu origin/master~0 + git checkout $nmutree . + 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 +} -- cgit v1.2.3