summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 13:40:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-31 13:40:47 +0100
commit1146c44cdb7a593d61318b9db4da82e51cbd476c (patch)
treecf6c0f61af2f13908cb59f5d0ec3c5248055f693
parentcd06cd0cf3b1190fde3862684a18a1d7d56a834e (diff)
test suite; convert-from-gbp: test not identical in upstream files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xtests/setup/gdr-convert-gbp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index b7e0b7d..a3baf2d 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -81,6 +81,9 @@ git push --set-upstream origin master
# debian/2.0-1 archive/debian/2.0-1
# remotes/origin/master remotes/dgit/dgit/sid
+t-expect-fail E:'identical in upstream files' \
+t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~
+
t-git-debrebase -fupstream-has-debian convert-from-gbp
v=2.0-2