summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 22:52:36 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:58 +0100
commitcb12325ce0b42acee748461d0520d99cd3c3008c (patch)
tree6304ae2180bcedd2b565f6085b812a66d9c8ea76 /tests
parent8c20e4c90a40d53b6cbcc8e0f523d3aa59ee3ec2 (diff)
git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/gdr-diverge-nmu12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 94fd44a..6d14bba 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -51,4 +51,16 @@ git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
git rm -rf debian/patches
git commit -m 'Incorporate NMU'
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
+
+: 'right, how are we'
+
+t-git-next-date
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
t-ok