X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgdr-convert-gbp;h=a3baf2d722e1eb61a0e144c16c856b52ee63719f;hb=6a7d91dc81cbc8922bebc4930991902a9a00da79;hp=d64b867c66653482c1ae030df1a3ecbe0f0e1019;hpb=a47f1af332372a372bf5758d1e3d9eeffe14acbd;p=dgit.git

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index d64b867c..a3baf2d7 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -11,6 +11,7 @@ t-dependencies GDR
 t-tstunt-parsechangelog
 
 not-gdr-processable () {
+	git branch gdr-unprocessable/$1
 	t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
@@ -37,7 +38,7 @@ gbp pq export
 git add debian/patches
 git commit -m "patch queue update ($0)"
 
-not-gdr-processable
+not-gdr-processable origin
 
 : 'fake up an upstream 2.0'
 git branch make-upstream upstream
@@ -61,7 +62,7 @@ done
 git checkout master
 gbp import-orig --upstream-version=2.0 ../$ust
 
-not-gdr-processable
+not-gdr-processable merge
 
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
 t-dch-commit-r
@@ -80,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
@@ -99,5 +103,3 @@ t-setup-done '' "$(echo $p*) salsa $($ifarchive echo git mirror aq)" '
 	p=example
 	t-git-next-date
 '
-
-t-ok