diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu | 22 | ||||
| -rwxr-xr-x | tests/tests/gdr-edits | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 6d14bba..9fb2c5d 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -33,6 +33,8 @@ t-some-changes 'maintainer' t-git-debrebase t-git-debrebase stitch +git branch did.maintainer + t-git-next-date t-dgit fetch @@ -63,4 +65,24 @@ 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-ok diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 83bd801..bb6c8d1 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -31,6 +31,6 @@ t-gdr-good pushed : todo 'more tests: other maint updated, we must fetch' : todo 'more tests: other maint updated, alert divergence' -: todo 'more tests: nmu divergence' +: todo 'more tests: dgit nmu divergence' t-ok |