git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 831a253071c4a5e0071d4b155d524327b7d3cd94..ac4a476ea3596ba34cd87f85c24b654a8c6d6889 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -151,6 +151,8 @@ t-nmu-upload-1 () {
        #  nmu-upload-1 <nmubranch>
        #  gbp pq import or perhaps other similar things
        #  nmu-upload-2
+       #  maybe make some dgit-covertible commits
+       #  nmu-upload-3
 
        t-git-next-date
        nmubranch=$1
@@ -165,7 +167,9 @@ t-nmu-upload-1 () {
 t-nmu-upload-2 () {
        t-git-next-date
        t-dch-commit -v $v -m "nmu $nmubranch $v"
-       t-some-changes "nmu $numbranch $v"
+}
+
+t-nmu-upload-3 () {
        t-dch-commit -r sid
 
        t-dgit -wgf build-source
@@ -180,3 +184,50 @@ t-nmu-upload-2 () {
        cd $p
        git checkout master
 }
+
+t-nmu-commit-an-upstream-change () {
+       echo >>newsrc.c "// more upstream"
+       git add newsrc.c
+       git commit -m 'UPSTREAM NMU'
+}
+
+t-maintainer-commit-some-changes () {
+       t-dch-commit -v$v -m "start $v"
+
+       t-some-changes "maintainer $v"
+       t-git-debrebase
+       t-git-debrebase stitch
+
+       git branch did.maintainer
+
+       t-git-next-date
+}
+
+t-nmu-causes-ff-fail () {
+       t-expect-fail E:'Not.*fast-forward' \
+       git merge --ff-only dgit/dgit/sid
+}
+
+t-nmu-reconciled-good () {
+       local nmutree=$1
+
+       : 'check that what we have is what is expected'
+
+       git checkout -b compare.nmu origin/master~0
+       git checkout $nmutree .
+       git rm -rf debian/patches
+       git commit -m 'rm patches nmu'
+
+       git checkout -b compare.maintainer origin/master~0
+       git checkout did.maintainer .
+       git rm -rf --ignore-unmatch debian/patches
+       git commit --allow-empty -m 'rm patches maintainer'
+
+       git merge compare.nmu
+       git diff --quiet master
+
+       : 'check that dgit still likes it'
+
+       git checkout master
+       t-dgit -wgf quilt-fixup
+}