From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 12:40:47 +0000 (+0100)
Subject: test suite; convert-from-gbp: test not identical in upstream files
X-Git-Tag: archive/debian/6.3~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1146c44cdb7a593d61318b9db4da82e51cbd476c

test suite; convert-from-gbp: test not identical in upstream files

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index b7e0b7d3..a3baf2d7 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