git-debrebase: merge: Actually record merge resolutions

[dgit.git] / tests / setup / gdr-convert-gbp

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 6ec374df0a2c645a4f72c1cdbc39c209e503a241..a3baf2d722e1eb61a0e144c16c856b52ee63719f 100755 (executable)
--- 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